diff --git a/src/adlist.c b/src/adlist.c index f075e1bda711..b4dba420f232 100644 --- a/src/adlist.c +++ b/src/adlist.c @@ -178,7 +178,7 @@ void listDelNode(list *list, listNode *node) listIter *listGetIterator(list *list, int direction) { listIter *iter; - + if ((iter = zmalloc(sizeof(*iter))) == NULL) return NULL; if (direction == AL_START_HEAD) iter->next = list->head; diff --git a/src/ae_kqueue.c b/src/ae_kqueue.c index dbcc5805f3f4..6796f4ceb593 100644 --- a/src/ae_kqueue.c +++ b/src/ae_kqueue.c @@ -54,7 +54,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) { return -1; } eventLoop->apidata = state; - return 0; + return 0; } static int aeApiResize(aeEventLoop *eventLoop, int setsize) { @@ -75,7 +75,7 @@ static void aeApiFree(aeEventLoop *eventLoop) { static int aeApiAddEvent(aeEventLoop *eventLoop, int fd, int mask) { aeApiState *state = eventLoop->apidata; struct kevent ke; - + if (mask & AE_READABLE) { EV_SET(&ke, fd, EVFILT_READ, EV_ADD, 0, 0, NULL); if (kevent(state->kqfd, &ke, 1, NULL, 0, NULL) == -1) return -1; @@ -118,16 +118,16 @@ static int aeApiPoll(aeEventLoop *eventLoop, struct timeval *tvp) { if (retval > 0) { int j; - + numevents = retval; for(j = 0; j < numevents; j++) { int mask = 0; struct kevent *e = state->events+j; - + if (e->filter == EVFILT_READ) mask |= AE_READABLE; if (e->filter == EVFILT_WRITE) mask |= AE_WRITABLE; - eventLoop->fired[j].fd = e->ident; - eventLoop->fired[j].mask = mask; + eventLoop->fired[j].fd = e->ident; + eventLoop->fired[j].mask = mask; } } return numevents; diff --git a/src/anet.c b/src/anet.c index 56385499f46a..87cc3ea25eb1 100644 --- a/src/anet.c +++ b/src/anet.c @@ -137,7 +137,7 @@ int anetEnableTcpNoDelay(char *err, int fd) return anetSetTcpNoDelay(err, fd, 1); } -int anetDisableTcpNoDelay(char *err, int fd) +int anetDisableTcpNoDelay(char *err, int fd) { return anetSetTcpNoDelay(err, fd, 0); } diff --git a/src/cluster.c b/src/cluster.c index b735b0e62c83..dc4540c214de 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -3598,7 +3598,7 @@ void clusterCommand(redisClient *c) { if (slots[j]) { int retval; - /* If this slot was set as importing we can clear this + /* If this slot was set as importing we can clear this * state as now we are the real owner of the slot. */ if (server.cluster->importing_slots_from[j]) server.cluster->importing_slots_from[j] = NULL; diff --git a/src/config.c b/src/config.c index a4e9c6c4ed15..a06b5458041e 100644 --- a/src/config.c +++ b/src/config.c @@ -1310,7 +1310,7 @@ struct rewriteConfigState *rewriteConfigReadOldFile(char *path) { * "force" is non-zero, the line is appended to the configuration file. * Usually "force" is true when an option has not its default value, so it * must be rewritten even if not present previously. - * + * * The first time a line is appended into a configuration file, a comment * is added to show that starting from that point the config file was generated * by CONFIG REWRITE. @@ -1436,7 +1436,7 @@ void rewriteConfigEnumOption(struct rewriteConfigState *state, char *option, int char *enum_name, *matching_name = NULL; int enum_val, def_val, force; sds line; - + va_start(ap, value); while(1) { enum_name = va_arg(ap,char*); @@ -1448,7 +1448,7 @@ void rewriteConfigEnumOption(struct rewriteConfigState *state, char *option, int if (value == enum_val) matching_name = enum_name; } va_end(ap); - + force = value != def_val; line = sdscatprintf(sdsempty(),"%s %s",option,matching_name); rewriteConfigRewriteLine(state,option,line,force); diff --git a/src/crc16.c b/src/crc16.c index 398ad73fb6c9..1ec9161c97e4 100644 --- a/src/crc16.c +++ b/src/crc16.c @@ -1,6 +1,6 @@ #include "redis.h" -/* +/* * Copyright 2001-2010 Georges Menie (www.menie.org) * Copyright 2010-2012 Salvatore Sanfilippo (adapted to Redis coding style) * All rights reserved. @@ -78,7 +78,7 @@ static const uint16_t crc16tab[256]= { 0xef1f,0xff3e,0xcf5d,0xdf7c,0xaf9b,0xbfba,0x8fd9,0x9ff8, 0x6e17,0x7e36,0x4e55,0x5e74,0x2e93,0x3eb2,0x0ed1,0x1ef0 }; - + uint16_t crc16(const char *buf, int len) { int counter; uint16_t crc = 0; diff --git a/src/db.c b/src/db.c index 291f3c2b89c2..c83ab2ee6a48 100644 --- a/src/db.c +++ b/src/db.c @@ -106,7 +106,7 @@ void dbAdd(redisDb *db, robj *key, robj *val) { * The program is aborted if the key was not already present. */ void dbOverwrite(redisDb *db, robj *key, robj *val) { dictEntry *de = dictFind(db->dict,key->ptr); - + redisAssertWithInfo(NULL,key,de != NULL); dictReplace(db->dict, key->ptr, val); } @@ -831,7 +831,7 @@ int expireIfNeeded(redisDb *db, robj *key) { * the slave key expiration is controlled by the master that will * send us synthesized DEL operations for expired keys. * - * Still we try to return the right information to the caller, + * Still we try to return the right information to the caller, * that is, 0 if we think the key should be still valid, 1 if * we think the key is expired at this time. */ if (server.masterhost != NULL) return now > when; diff --git a/src/endianconv.h b/src/endianconv.h index 7c16e175f5ff..d93cd99ba4f5 100644 --- a/src/endianconv.h +++ b/src/endianconv.h @@ -28,7 +28,7 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - */ + */ #ifndef __ENDIANCONV_H #define __ENDIANCONV_H diff --git a/src/lzf.h b/src/lzf.h index 919b6e6be2d2..98e038f31820 100644 --- a/src/lzf.h +++ b/src/lzf.h @@ -1,16 +1,16 @@ /* * Copyright (c) 2000-2008 Marc Alexander Lehmann - * + * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO @@ -73,7 +73,7 @@ * and lzf_c.c. * */ -unsigned int +unsigned int lzf_compress (const void *const in_data, unsigned int in_len, void *out_data, unsigned int out_len); @@ -92,7 +92,7 @@ lzf_compress (const void *const in_data, unsigned int in_len, * * This function is very fast, about as fast as a copying loop. */ -unsigned int +unsigned int lzf_decompress (const void *const in_data, unsigned int in_len, void *out_data, unsigned int out_len); diff --git a/src/lzfP.h b/src/lzfP.h index 10d804e04b51..c9eae3f6a65b 100644 --- a/src/lzfP.h +++ b/src/lzfP.h @@ -1,16 +1,16 @@ /* * Copyright (c) 2000-2007 Marc Alexander Lehmann - * + * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO diff --git a/src/lzf_c.c b/src/lzf_c.c index 99dab091c623..9e031ad0bc0f 100644 --- a/src/lzf_c.c +++ b/src/lzf_c.c @@ -1,16 +1,16 @@ /* * Copyright (c) 2000-2008 Marc Alexander Lehmann - * + * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO diff --git a/src/lzf_d.c b/src/lzf_d.c index e7e48c13812a..6c723f5e07f3 100644 --- a/src/lzf_d.c +++ b/src/lzf_d.c @@ -1,16 +1,16 @@ /* * Copyright (c) 2000-2007 Marc Alexander Lehmann - * + * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO @@ -52,7 +52,7 @@ #endif */ -unsigned int +unsigned int lzf_decompress (const void *const in_data, unsigned int in_len, void *out_data, unsigned int out_len) { diff --git a/src/multi.c b/src/multi.c index 7000c4841407..3d78e1488e68 100644 --- a/src/multi.c +++ b/src/multi.c @@ -214,7 +214,7 @@ void watchForKey(redisClient *c, robj *key) { } /* This key is not already watched in this DB. Let's add it */ clients = dictFetchValue(c->db->watched_keys,key); - if (!clients) { + if (!clients) { clients = listCreate(); dictAdd(c->db->watched_keys,key,clients); incrRefCount(key); diff --git a/src/networking.c b/src/networking.c index 0c27605040cb..8bc6389a41cd 100644 --- a/src/networking.c +++ b/src/networking.c @@ -1495,7 +1495,7 @@ void rewriteClientCommandVector(redisClient *c, int argc, ...) { va_start(ap,argc); for (j = 0; j < argc; j++) { robj *a; - + a = va_arg(ap, robj*); argv[j] = a; incrRefCount(a); @@ -1517,7 +1517,7 @@ void rewriteClientCommandVector(redisClient *c, int argc, ...) { * The new val ref count is incremented, and the old decremented. */ void rewriteClientCommandArgument(redisClient *c, int i, robj *newval) { robj *oldval; - + redisAssertWithInfo(c,NULL,i < c->argc); oldval = c->argv[i]; c->argv[i] = newval; diff --git a/src/pqsort.c b/src/pqsort.c index 7325a88a440b..508c09f920fa 100644 --- a/src/pqsort.c +++ b/src/pqsort.c @@ -69,7 +69,7 @@ static inline void swapfunc(char *a, char *b, size_t n, int swaptype) { - if (swaptype <= 1) + if (swaptype <= 1) swapcode(long, a, b, n) else swapcode(char, a, b, n) @@ -160,9 +160,9 @@ loop: SWAPINIT(a, es); (lrange > _r && rrange > _r))) _pqsort(a, r / es, es, cmp, lrange, rrange); } - if ((r = pd - pc) > es) { + if ((r = pd - pc) > es) { void *_l, *_r; - + /* Iterate rather than recurse to save stack space */ a = pn - r; n = r / es; diff --git a/src/rdb.c b/src/rdb.c index 07eb8a9274c4..50b3cc1a79e8 100644 --- a/src/rdb.c +++ b/src/rdb.c @@ -671,7 +671,7 @@ int rdbSave(char *filename) { sds keystr = dictGetKey(de); robj key, *o = dictGetVal(de); long long expire; - + initStaticStringObject(key,keystr); expire = getExpire(db,&key); if (rdbSaveKeyValuePair(&rdb,&key,o,expire,now) == -1) goto werr; diff --git a/src/redis-check-dump.c b/src/redis-check-dump.c index 4b0c1300fda8..a4f103fddd98 100644 --- a/src/redis-check-dump.c +++ b/src/redis-check-dump.c @@ -143,7 +143,7 @@ static char types[256][16]; /* Return true if 't' is a valid object type. */ int checkType(unsigned char t) { - /* In case a new object type is added, update the following + /* In case a new object type is added, update the following * condition as necessary. */ return (t >= REDIS_HASH_ZIPMAP && t <= REDIS_HASH_ZIPLIST) || @@ -514,7 +514,7 @@ entry loadEntry() { return e; } else { /* optionally consume expire */ - if (e.type == REDIS_EXPIRETIME || + if (e.type == REDIS_EXPIRETIME || e.type == REDIS_EXPIRETIME_MS) { if (!processTime(e.type)) return e; if (!loadType(&e)) return e; diff --git a/src/redis-cli.c b/src/redis-cli.c index e6cfcbad1f08..cef86ef2d9a5 100644 --- a/src/redis-cli.c +++ b/src/redis-cli.c @@ -1150,7 +1150,7 @@ static void getRDB(void) { while(payload) { ssize_t nread, nwritten; - + nread = read(s,buf,(payload > sizeof(buf)) ? sizeof(buf) : payload); if (nread <= 0) { fprintf(stderr,"I/O Error reading RDB payload from socket\n"); @@ -1233,7 +1233,7 @@ static void pipeMode(void) { errors++; } else if (eof && reply->type == REDIS_REPLY_STRING && reply->len == 20) { - /* Check if this is the reply to our final ECHO + /* Check if this is the reply to our final ECHO * command. If so everything was received * from the server. */ if (memcmp(reply->str,magic,20) == 0) { @@ -1254,7 +1254,7 @@ static void pipeMode(void) { /* Transfer current buffer to server. */ if (obuf_len != 0) { ssize_t nwritten = write(fd,obuf+obuf_pos,obuf_len); - + if (nwritten == -1) { if (errno != EAGAIN && errno != EINTR) { fprintf(stderr, "Error writing to the server: %s\n", @@ -1357,7 +1357,7 @@ static redisReply *sendScan(unsigned long long *it) { /* Validate our types are correct */ assert(reply->element[0]->type == REDIS_REPLY_STRING); assert(reply->element[1]->type == REDIS_REPLY_ARRAY); - + /* Update iterator */ *it = atoi(reply->element[0]->str); @@ -1369,7 +1369,7 @@ static int getDbSize(void) { int size; reply = redisCommand(context, "DBSIZE"); - + if(reply == NULL || reply->type != REDIS_REPLY_INTEGER) { fprintf(stderr, "Couldn't determine DBSIZE!\n"); exit(1); @@ -1422,13 +1422,13 @@ static void getKeyTypes(redisReply *keys, int *types) { exit(1); } - types[i] = toIntType(keys->element[i]->str, reply->str); + types[i] = toIntType(keys->element[i]->str, reply->str); freeReplyObject(reply); } } -static void getKeySizes(redisReply *keys, int *types, - unsigned long long *sizes) +static void getKeySizes(redisReply *keys, int *types, + unsigned long long *sizes) { redisReply *reply; char *sizecmds[] = {"STRLEN","LLEN","SCARD","HLEN","ZCARD"}; @@ -1437,10 +1437,10 @@ static void getKeySizes(redisReply *keys, int *types, /* Pipeline size commands */ for(i=0;ielements;i++) { /* Skip keys that were deleted */ - if(types[i]==TYPE_NONE) + if(types[i]==TYPE_NONE) continue; - redisAppendCommand(context, "%s %s", sizecmds[types[i]], + redisAppendCommand(context, "%s %s", sizecmds[types[i]], keys->element[i]->str); } @@ -1460,14 +1460,14 @@ static void getKeySizes(redisReply *keys, int *types, } else if(reply->type != REDIS_REPLY_INTEGER) { /* Theoretically the key could have been removed and * added as a different type between TYPE and SIZE */ - fprintf(stderr, + fprintf(stderr, "Warning: %s on '%s' failed (may have changed type)\n", sizecmds[types[i]], keys->element[i]->str); sizes[i] = 0; } else { sizes[i] = reply->integer; } - + freeReplyObject(reply); } } @@ -1524,12 +1524,12 @@ static void findBigKeys(void) { /* Retreive types and then sizes */ getKeyTypes(keys, types); getKeySizes(keys, types, sizes); - + /* Now update our stats */ for(i=0;ielements;i++) { if((type = types[i]) == TYPE_NONE) continue; - + totalsize[type] += sizes[i]; counts[type]++; totlen += keys->element[i]->len; @@ -1549,7 +1549,7 @@ static void findBigKeys(void) { } /* Keep track of the biggest size for this type */ - biggest[type] = sizes[i]; + biggest[type] = sizes[i]; } /* Update overall progress */ @@ -1562,7 +1562,7 @@ static void findBigKeys(void) { if(sampled && (sampled %100) == 0 && config.interval) { usleep(config.interval); } - + freeReplyObject(reply); } while(it != 0); diff --git a/src/redis.c b/src/redis.c index f6d4abf1fd9c..c91763a66b7c 100644 --- a/src/redis.c +++ b/src/redis.c @@ -356,7 +356,7 @@ void redisLogFromHandler(int level, const char *msg) { if ((level&0xff) < server.verbosity || (log_to_stdout && server.daemonize)) return; - fd = log_to_stdout ? STDOUT_FILENO : + fd = log_to_stdout ? STDOUT_FILENO : open(server.logfile, O_APPEND|O_CREAT|O_WRONLY, 0644); if (fd == -1) return; ll2string(buf,sizeof(buf),getpid()); @@ -1140,7 +1140,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) { if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) { int exitcode = WEXITSTATUS(statloc); int bysignal = 0; - + if (WIFSIGNALED(statloc)) bysignal = WTERMSIG(statloc); if (pid == server.rdb_child_pid) { @@ -1506,7 +1506,7 @@ void initServerConfig() { server.lpushCommand = lookupCommandByCString("lpush"); server.lpopCommand = lookupCommandByCString("lpop"); server.rpopCommand = lookupCommandByCString("rpop"); - + /* Slow log */ server.slowlog_log_slower_than = REDIS_SLOWLOG_LOG_SLOWER_THAN; server.slowlog_max_len = REDIS_SLOWLOG_MAX_LEN; @@ -2452,7 +2452,7 @@ sds genRedisInfoString(char *section) { if (server.cluster_enabled) mode = "cluster"; else if (server.sentinel_mode) mode = "sentinel"; else mode = "standalone"; - + if (sections++) info = sdscat(info,"\r\n"); if (call_uname) { diff --git a/src/redis.h b/src/redis.h index b39206f93c9a..2622fb97bd84 100644 --- a/src/redis.h +++ b/src/redis.h @@ -69,7 +69,7 @@ /* Static server configuration */ #define REDIS_DEFAULT_HZ 10 /* Time interrupt calls/sec. */ #define REDIS_MIN_HZ 1 -#define REDIS_MAX_HZ 500 +#define REDIS_MAX_HZ 500 #define REDIS_SERVERPORT 6379 /* TCP port */ #define REDIS_TCP_BACKLOG 511 /* TCP listen backlog */ #define REDIS_MAXIDLETIME 0 /* default client timeout: infinite */ diff --git a/src/release.c b/src/release.c index 4c5e1f7452ec..4e59c747486f 100644 --- a/src/release.c +++ b/src/release.c @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* Every time the Redis Git SHA1 or Dirty status changes only this small +/* Every time the Redis Git SHA1 or Dirty status changes only this small * file is recompiled, as we access this information in all the other * files using this functions. */ diff --git a/src/replication.c b/src/replication.c index 07cc11ed719c..ff0a0141adf0 100644 --- a/src/replication.c +++ b/src/replication.c @@ -199,7 +199,7 @@ void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc) { long objlen = stringObjectLen(argv[j]); /* We need to feed the buffer with the object as a bulk reply - * not just as a plain string, so create the $..CRLF payload len + * not just as a plain string, so create the $..CRLF payload len * ad add the final CRLF */ aux[0] = '$'; len = ll2string(aux+1,sizeof(aux)-1,objlen); @@ -446,7 +446,7 @@ void syncCommand(redisClient *c) { return; /* No full resync needed, return. */ } else { char *master_runid = c->argv[1]->ptr; - + /* Increment stats for failed PSYNCs, but only if the * runid is not "?", as this is used by slaves to force a full * resync on purpose when they are not albe to partially @@ -1793,7 +1793,7 @@ void replicationCron(void) { if (server.masterhost && server.master && !(server.master->flags & REDIS_PRE_PSYNC)) replicationSendAck(); - + /* If we have attached slaves, PING them from time to time. * So slaves can implement an explicit timeout to masters, and will * be able to detect a link disconnection even if the TCP connection diff --git a/src/sds.c b/src/sds.c index 47b9823ea0a6..dc07d0d3affc 100644 --- a/src/sds.c +++ b/src/sds.c @@ -123,7 +123,7 @@ void sdsclear(sds s) { /* Enlarge the free space at the end of the sds string so that the caller * is sure that after calling this function can overwrite up to addlen * bytes after the end of the string, plus one more byte for nul term. - * + * * Note: this does not change the *length* of the sds string as returned * by sdslen(), but only the free buffer space we have. */ sds sdsMakeRoomFor(sds s, size_t addlen) { diff --git a/src/syncio.c b/src/syncio.c index 0c202c9e242a..8810a842c9aa 100644 --- a/src/syncio.c +++ b/src/syncio.c @@ -119,7 +119,7 @@ ssize_t syncRead(int fd, char *ptr, ssize_t size, long long timeout) { /* Read a line making sure that every char will not require more than 'timeout' * milliseconds to be read. - * + * * On success the number of bytes read is returned, otherwise -1. * On success the string is always correctly terminated with a 0 byte. */ ssize_t syncReadLine(int fd, char *ptr, ssize_t size, long long timeout) { diff --git a/src/t_list.c b/src/t_list.c index d03879bdd6e5..7c79185fd94f 100644 --- a/src/t_list.c +++ b/src/t_list.c @@ -1009,7 +1009,7 @@ void handleClientsBlockedOnLists(void) { } } } - + if (listTypeLength(o) == 0) dbDelete(rl->db,rl->key); /* We don't call signalModifiedKey() as it was already called * when an element was pushed on the list. */ diff --git a/src/t_set.c b/src/t_set.c index 6e8e1f4e00fc..c530d6923601 100644 --- a/src/t_set.c +++ b/src/t_set.c @@ -512,7 +512,7 @@ void srandmemberWithCountCommand(redisClient *c) { size--; } } - + /* CASE 4: We have a big set compared to the requested number of elements. * In this case we can simply get random elements from the set and add * to the temporary set, trying to eventually get enough unique elements diff --git a/src/t_zset.c b/src/t_zset.c index 8bb5bde6d787..ab094654216d 100644 --- a/src/t_zset.c +++ b/src/t_zset.c @@ -1169,7 +1169,7 @@ void zsetConvert(robj *zobj, int encoding) { } /*----------------------------------------------------------------------------- - * Sorted set commands + * Sorted set commands *----------------------------------------------------------------------------*/ /* This generic command implements both ZADD and ZINCRBY. */ diff --git a/src/zipmap.c b/src/zipmap.c index 140126a71084..803fedeec12c 100644 --- a/src/zipmap.c +++ b/src/zipmap.c @@ -56,7 +56,7 @@ * signal the end of the hash. The special value 254 is used to mark * empty space that can be used to add new key/value pairs. * - * is the number of free unused bytes after the string, resulting + * is the number of free unused bytes after the string, resulting * from modification of values associated to a key. For instance if "foo" * is set to "bar", and later "foo" will be set to "hi", it will have a * free byte to use if the value will enlarge again later, or even in @@ -186,7 +186,7 @@ static unsigned int zipmapRawKeyLength(unsigned char *p) { static unsigned int zipmapRawValueLength(unsigned char *p) { unsigned int l = zipmapDecodeLength(p); unsigned int used; - + used = zipmapEncodeLength(NULL,l); used += p[used] + 1 + l; return used; @@ -214,7 +214,7 @@ unsigned char *zipmapSet(unsigned char *zm, unsigned char *key, unsigned int kle unsigned int freelen, reqlen = zipmapRequiredLength(klen,vlen); unsigned int empty, vempty; unsigned char *p; - + freelen = reqlen; if (update) *update = 0; p = zipmapLookupRaw(zm,key,klen,&zmlen);