Fix various int/size_t discrepancies

Removes warnings on windows.  Fixes at least one bug, negating an unsigned int.

Author: kristjanvalur

async.c

@@ -75,7 +75,7 @@ static void *callbackValDup(void *privdata, const void *src) {
 }
 
 static int callbackKeyCompare(void *privdata, const void *key1, const void *key2) {
-    int l1, l2;
+    size_t l1, l2;
     ((void) privdata);
 
     l1 = sdslen((const sds)key1);

dict.c

@@ -51,7 +51,7 @@ static int _dictInit(dict *ht, dictType *type, void *privDataPtr);
 
 /* Generic hash function (a popular one from Bernstein).
  * I tested a few and this was the best. */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len) {
+static unsigned int dictGenHashFunction(const unsigned char *buf, size_t len) {
     unsigned int hash = 5381;
 
     while (len--)

dict.h

@@ -111,7 +111,7 @@ typedef struct dictIterator {
 #define dictSize(ht) ((ht)->used)
 
 /* API */
-static unsigned int dictGenHashFunction(const unsigned char *buf, int len);
+static unsigned int dictGenHashFunction(const unsigned char *buf, size_t len);
 static dict *dictCreate(dictType *type, void *privDataPtr);
 static int dictExpand(dict *ht, unsigned long size);
 static int dictAdd(dict *ht, void *key, void *val);

hiredis.c

@@ -312,12 +312,12 @@ static size_t bulklen(size_t len) {
 int redisvFormatCommand(char **target, const char *format, va_list ap) {
     const char *c = format;
     char *cmd = NULL; /* final command */
-    int pos; /* position in final command */
+    size_t pos; /* position in final command */
     sds curarg, newarg; /* current argument */
     int touched = 0; /* was the current argument touched? */
     char **curargv = NULL, **newargv = NULL;
     int argc = 0;
-    int totlen = 0;
+    size_t totlen = 0;
     int error_type = 0; /* 0 = no error; -1 = memory error; -2 = format error */
     int j;
 
@@ -516,7 +516,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
 
     hi_free(curargv);
     *target = cmd;
-    return totlen;
+    return (int)totlen;
 
 format_err:
     error_type = -2;
@@ -576,7 +576,7 @@ int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
                               const size_t *argvlen)
 {
     sds cmd, aux;
-    unsigned long long totlen;
+    size_t totlen;
     int j;
     size_t len;
 
@@ -617,7 +617,7 @@ int redisFormatSdsCommandArgv(sds *target, int argc, const char **argv,
     assert(sdslen(cmd)==totlen);
 
     *target = cmd;
-    return totlen;
+    return (int) totlen; /* should use ssize_t */
 }
 
 void redisFreeSdsCommand(sds cmd) {
@@ -631,9 +631,10 @@ void redisFreeSdsCommand(sds cmd) {
  */
 int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen) {
     char *cmd = NULL; /* final command */
-    int pos; /* position in final command */
+    size_t pos; /* position in final command */
     size_t len;
-    int totlen, j;
+    size_t totlen;
+    int j;
 
     /* Abort on a NULL target */
     if (target == NULL)
@@ -664,7 +665,7 @@ int redisFormatCommandArgv(char **target, int argc, const char **argv, const siz
     cmd[pos] = '\0';
 
     *target = cmd;
-    return totlen;
+    return (int)totlen;  /* should really use ssize_t */
 }
 
 void redisFreeCommand(char *cmd) {
@@ -939,7 +940,7 @@ redisPushFn *redisSetPushCallback(redisContext *c, redisPushFn *fn) {
  * see if there is a reply available. */
 int redisBufferRead(redisContext *c) {
     char buf[1024*16];
-    int nread;
+    ssize_t nread;
 
     /* Return early when the context has seen an error. */
     if (c->err)

net.c

@@ -272,7 +272,7 @@ static int redisContextWaitReady(redisContext *c, long msec) {
 }
 
 int redisCheckConnectDone(redisContext *c, int *completed) {
-    int rc = connect(c->fd, (const struct sockaddr *)c->saddr, c->addrlen);
+    int rc = connect(c->fd, (const struct sockaddr *)c->saddr, (socklen_t)c->addrlen);
     if (rc == 0) {
         *completed = 1;
         return REDIS_OK;
@@ -315,7 +315,7 @@ int redisCheckSocketError(redisContext *c) {
 
 int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
     const void *to_ptr = &tv;
-    size_t to_sz = sizeof(tv);
+    socklen_t to_sz = sizeof(tv);
 
     if (setsockopt(c->fd,SOL_SOCKET,SO_RCVTIMEO,to_ptr,to_sz) == -1) {
         __redisSetErrorFromErrno(c,REDIS_ERR_IO,"setsockopt(SO_RCVTIMEO)");
@@ -457,7 +457,7 @@ static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
             }
 
             for (b = bservinfo; b != NULL; b = b->ai_next) {
-                if (bind(s,b->ai_addr,b->ai_addrlen) != -1) {
+                if (bind(s,b->ai_addr,(socklen_t)b->ai_addrlen) != -1) {
                     bound = 1;
                     break;
                 }
@@ -480,7 +480,7 @@ static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
         memcpy(c->saddr, p->ai_addr, p->ai_addrlen);
         c->addrlen = p->ai_addrlen;
 
-        if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
+        if (connect(s,p->ai_addr,(socklen_t)p->ai_addrlen) == -1) {
             if (errno == EHOSTUNREACH) {
                 redisNetClose(c);
                 continue;
@@ -600,13 +600,13 @@ int redisContextConnectUnix(redisContext *c, const char *path, const struct time
 
     c->flags |= REDIS_CONNECTED;
     return REDIS_OK;
+oom:
+    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
+    return REDIS_ERR;
 #else
     /* We currently do not support Unix sockets for Windows. */
     /* TODO(m): https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/ */
     errno = EPROTONOSUPPORT;
     return REDIS_ERR;
 #endif /* _WIN32 */
-oom:
-    __redisSetError(c, REDIS_ERR_OOM, "Out of memory");
-    return REDIS_ERR;
 }

read.c

@@ -213,7 +213,7 @@ static int string2ll(const char *s, size_t slen, long long *value) {
     if (negative) {
         if (v > ((unsigned long long)(-(LLONG_MIN+1))+1)) /* Overflow. */
             return REDIS_ERR;
-        if (value != NULL) *value = -v;
+        if (value != NULL) *value = -(long long)v;
     } else {
         if (v > LLONG_MAX) /* Overflow. */
             return REDIS_ERR;
@@ -222,9 +222,9 @@ static int string2ll(const char *s, size_t slen, long long *value) {
     return REDIS_OK;
 }
 
-static char *readLine(redisReader *r, int *_len) {
+static char *readLine(redisReader *r, size_t *_len) {
     char *p, *s;
-    int len;
+    size_t len;
 
     p = r->buf+r->pos;
     s = seekNewline(p,(r->len-r->pos));
@@ -269,7 +269,7 @@ static int processLineItem(redisReader *r) {
     redisReadTask *cur = r->task[r->ridx];
     void *obj;
     char *p;
-    int len;
+    size_t len;
 
     if ((p = readLine(r,&len)) != NULL) {
         if (cur->type == REDIS_REPLY_INTEGER) {
@@ -290,7 +290,7 @@ static int processLineItem(redisReader *r) {
             char buf[326], *eptr;
             double d;
 
-            if ((size_t)len >= sizeof(buf)) {
+            if (len >= sizeof(buf)) {
                 __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
                         "Double value is too large");
                 return REDIS_ERR;
@@ -349,7 +349,7 @@ static int processLineItem(redisReader *r) {
         } else if (cur->type == REDIS_REPLY_BIGNUM) {
             /* Ensure all characters are decimal digits (with possible leading
              * minus sign). */
-            for (int i = 0; i < len; i++) {
+            for (size_t i = 0; i < len; i++) {
                 /* XXX Consider: Allow leading '+'? Error on leading '0's? */
                 if (i == 0 && p[0] == '-') continue;
                 if (p[i] < '0' || p[i] > '9') {
@@ -364,7 +364,7 @@ static int processLineItem(redisReader *r) {
                 obj = (void*)REDIS_REPLY_BIGNUM;
         } else {
             /* Type will be error or status. */
-            for (int i = 0; i < len; i++) {
+            for (size_t i = 0; i < len; i++) {
                 if (p[i] == '\r' || p[i] == '\n') {
                     __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
                             "Bad simple string value");
@@ -396,7 +396,7 @@ static int processBulkItem(redisReader *r) {
     void *obj = NULL;
     char *p, *s;
     long long len;
-    unsigned long bytelen;
+    size_t bytelen;
     int success = 0;
 
     p = r->buf+r->pos;
@@ -439,7 +439,7 @@ static int processBulkItem(redisReader *r) {
                 if (r->fn && r->fn->createString)
                     obj = r->fn->createString(cur,s+2,len);
                 else
-                    obj = (void*)(long)cur->type;
+                    obj = (void*)(intptr_t)cur->type;
                 success = 1;
             }
         }
@@ -494,7 +494,8 @@ static int processAggregateItem(redisReader *r) {
     void *obj;
     char *p;
     long long elements;
-    int root = 0, len;
+    int root = 0;
+    size_t len;
 
     if (r->ridx == r->tasks - 1) {
         if (redisReaderGrow(r) == REDIS_ERR)
@@ -536,7 +537,7 @@ static int processAggregateItem(redisReader *r) {
             if (r->fn && r->fn->createArray)
                 obj = r->fn->createArray(cur,elements);
             else
-                obj = (void*)(long)cur->type;
+                obj = (void*)(intptr_t)cur->type;
 
             if (obj == NULL) {
                 __redisReaderSetErrorOOM(r);

sds.c

@@ -98,27 +98,27 @@ sds sdsnewlen(const void *init, size_t initlen) {
     fp = ((unsigned char*)s)-1;
     switch(type) {
         case SDS_TYPE_5: {
-            *fp = type | (initlen << SDS_TYPE_BITS);
+            *fp = type | ((char)initlen << SDS_TYPE_BITS);
             break;
         }
         case SDS_TYPE_8: {
             SDS_HDR_VAR(8,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
+            sh->len = (uint8_t) initlen;
+            sh->alloc = (uint8_t) initlen;
             *fp = type;
             break;
         }
         case SDS_TYPE_16: {
             SDS_HDR_VAR(16,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
+            sh->len = (uint16_t)initlen;
+            sh->alloc = (uint16_t)initlen;
             *fp = type;
             break;
         }
         case SDS_TYPE_32: {
             SDS_HDR_VAR(32,s);
-            sh->len = initlen;
-            sh->alloc = initlen;
+            sh->len = (uint32_t)initlen;
+            sh->alloc = (uint32_t)initlen;
             *fp = type;
             break;
         }
@@ -174,7 +174,7 @@ void sdsfree(sds s) {
  * the output will be "6" as the string was modified but the logical length
  * remains 6 bytes. */
 void sdsupdatelen(sds s) {
-    int reallen = strlen(s);
+    size_t reallen = strlen(s);
     sdssetlen(s, reallen);
 }
 
@@ -428,7 +428,7 @@ sds sdscpy(sds s, const char *t) {
  * The function returns the length of the null-terminated string
  * representation stored at 's'. */
 #define SDS_LLSTR_SIZE 21
-int sdsll2str(char *s, long long value) {
+size_t sdsll2str(char *s, long long value) {
     char *p, aux;
     unsigned long long v;
     size_t l;
@@ -460,7 +460,7 @@ int sdsll2str(char *s, long long value) {
 }
 
 /* Identical sdsll2str(), but for unsigned long long type. */
-int sdsull2str(char *s, unsigned long long v) {
+size_t sdsull2str(char *s, unsigned long long v) {
     char *p, aux;
     size_t l;
 
@@ -494,7 +494,7 @@ int sdsull2str(char *s, unsigned long long v) {
  */
 sds sdsfromlonglong(long long value) {
     char buf[SDS_LLSTR_SIZE];
-    int len = sdsll2str(buf,value);
+    size_t len = sdsll2str(buf,value);
 
     return sdsnewlen(buf,len);
 }
@@ -580,7 +580,7 @@ sds sdscatprintf(sds s, const char *fmt, ...) {
  */
 sds sdscatfmt(sds s, char const *fmt, ...) {
     const char *f = fmt;
-    int i;
+    size_t i;
     va_list ap;
 
     va_start(ap,fmt);
@@ -755,14 +755,14 @@ int sdsrange(sds s, ssize_t start, ssize_t end) {
 
 /* Apply tolower() to every character of the sds string 's'. */
 void sdstolower(sds s) {
-    int len = sdslen(s), j;
+    size_t len = sdslen(s), j;
 
     for (j = 0; j < len; j++) s[j] = tolower(s[j]);
 }
 
 /* Apply toupper() to every character of the sds string 's'. */
 void sdstoupper(sds s) {
-    int len = sdslen(s), j;
+    size_t len = sdslen(s), j;
 
     for (j = 0; j < len; j++) s[j] = toupper(s[j]);
 }
@@ -786,7 +786,7 @@ int sdscmp(const sds s1, const sds s2) {
     l2 = sdslen(s2);
     minlen = (l1 < l2) ? l1 : l2;
     cmp = memcmp(s1,s2,minlen);
-    if (cmp == 0) return l1-l2;
+    if (cmp == 0) return l1 < l2 ? -1 : 1;
     return cmp;
 }