From 9d31768cbb1702aaf47b068e3146f572021098de Mon Sep 17 00:00:00 2001 From: Madelyn Olson <34459052+madolson@users.noreply.github.com> Date: Mon, 2 Oct 2023 16:44:09 -0700 Subject: [PATCH] Fix a couple of tabs that caused misindentation (#12541) Fixed some usages of tabs which caused weird indentation in the code. Tried to find all of the places so their was one PR. I ignored all of the usages of tabs which don't really affect readability. --- src/cluster.c | 8 ++++---- src/config.c | 2 +- src/redis-cli.c | 4 ++-- src/zmalloc.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cluster.c b/src/cluster.c index 9366c32d1..d1e7b1173 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -2580,7 +2580,7 @@ uint32_t writePingExt(clusterMsg *hdr, int gossipcount) { clusterMsgPingExtHumanNodename *ext = preparePingExt(cursor, CLUSTERMSG_EXT_TYPE_HUMAN_NODENAME, getHumanNodenamePingExtSize()); memcpy(ext->human_nodename, myself->human_nodename, sdslen(myself->human_nodename)); - /* Move the write cursor */ + /* Move the write cursor */ cursor = nextPingExt(cursor); } @@ -2646,7 +2646,7 @@ void clusterProcessPingExtensions(clusterMsg *hdr, clusterLink *link) { if (type == CLUSTERMSG_EXT_TYPE_HOSTNAME) { clusterMsgPingExtHostname *hostname_ext = (clusterMsgPingExtHostname *) &(ext->ext[0].hostname); ext_hostname = hostname_ext->hostname; - } else if (type == CLUSTERMSG_EXT_TYPE_HUMAN_NODENAME) { + } else if (type == CLUSTERMSG_EXT_TYPE_HUMAN_NODENAME) { clusterMsgPingExtHumanNodename *humannodename_ext = (clusterMsgPingExtHumanNodename *) &(ext->ext[0].human_nodename); ext_humannodename = humannodename_ext->human_nodename; } else if (type == CLUSTERMSG_EXT_TYPE_FORGOTTEN_NODE) { @@ -4247,7 +4247,7 @@ void clusterHandleSlaveFailover(void) { if (server.cluster->mf_end) { server.cluster->failover_auth_time = mstime(); server.cluster->failover_auth_rank = 0; - clusterDoBeforeSleep(CLUSTER_TODO_HANDLE_FAILOVER); + clusterDoBeforeSleep(CLUSTER_TODO_HANDLE_FAILOVER); } serverLog(LL_NOTICE, "Start of election delayed for %lld milliseconds " @@ -4783,7 +4783,7 @@ void clusterCron(void) { * a migration if there is no master with at least *two* working * slaves. */ if (orphaned_masters && max_slaves >= 2 && this_slaves == max_slaves && - server.cluster_allow_replica_migration) + server.cluster_allow_replica_migration) clusterHandleSlaveMigration(max_slaves); } diff --git a/src/config.c b/src/config.c index cd2bc1676..731b503b3 100644 --- a/src/config.c +++ b/src/config.c @@ -2387,7 +2387,7 @@ static int isValidShutdownOnSigFlags(int val, const char **err) { static int isValidAnnouncedNodename(char *val,const char **err) { if (!(isValidAuxString(val,sdslen(val)))) { *err = "Announced human node name contained invalid character"; - return 0; + return 0; } return 1; } diff --git a/src/redis-cli.c b/src/redis-cli.c index 85906e34b..caa996dfa 100644 --- a/src/redis-cli.c +++ b/src/redis-cli.c @@ -3278,8 +3278,8 @@ static int isSensitiveCommand(int argc, char **argv) { !strcasecmp(argv[1],"set")) { for (int j = 2; j < argc; j = j+2) { if (!strcasecmp(argv[j],"masterauth") || - !strcasecmp(argv[j],"masteruser") || - !strcasecmp(argv[j],"requirepass")) { + !strcasecmp(argv[j],"masteruser") || + !strcasecmp(argv[j],"requirepass")) { return 1; } } diff --git a/src/zmalloc.c b/src/zmalloc.c index bbfa38651..3241a70fb 100644 --- a/src/zmalloc.c +++ b/src/zmalloc.c @@ -608,7 +608,7 @@ size_t zmalloc_get_rss(void) { if ((fd = open(filename,O_RDONLY)) == -1) return 0; if (ioctl(fd, PIOCPSINFO, &info) == -1) { close(fd); - return 0; + return 0; } close(fd);