printf format warnings fixed by casting

diff --git a/redis-cli.c b/redis-cli.c
index bcef3c1e6800686b4ca519e50fc5e81917ae2164..32e77e4c1198f502148a2453a2f05082c79c403c 100644 (file)
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -311,7 +311,8 @@ static int cliSendCommand(int argc, char **argv) {
         if (rc->flags & REDIS_CMD_MULTIBULK) {
             cmd = sdscatprintf(cmd,"*%d\r\n",argc);
             for (j = 0; j < argc; j++) {
         if (rc->flags & REDIS_CMD_MULTIBULK) {
             cmd = sdscatprintf(cmd,"*%d\r\n",argc);
             for (j = 0; j < argc; j++) {

-                cmd = sdscatprintf(cmd,"$%lu\r\n",sdslen(argv[j]));
+                cmd = sdscatprintf(cmd,"$%lu\r\n",
+                    (unsigned long)sdslen(argv[j]));

                 cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
                 cmd = sdscatlen(cmd,"\r\n",2);
             }
                 cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
                 cmd = sdscatlen(cmd,"\r\n",2);
             }


@@ -319,7 +320,8 @@ static int cliSendCommand(int argc, char **argv) {
             for (j = 0; j < argc; j++) {
                 if (j != 0) cmd = sdscat(cmd," ");
                 if (j == argc-1 && rc->flags & REDIS_CMD_BULK) {
             for (j = 0; j < argc; j++) {
                 if (j != 0) cmd = sdscat(cmd," ");
                 if (j == argc-1 && rc->flags & REDIS_CMD_BULK) {

-                    cmd = sdscatprintf(cmd,"%lu",sdslen(argv[j]));
+                    cmd = sdscatprintf(cmd,"%lu",
+                        (unsigned long)sdslen(argv[j]));

                 } else {
                     cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
                 }
                 } else {
                     cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
                 }

diff --git a/redis.c b/redis.c
index 75490f239f425cb8f04595070bd9cc16becd0243..2ea511f5f3def77a3f9788ddd4d39557a6819842 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -27,7 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define REDIS_VERSION "1.1.90"
+#define REDIS_VERSION "1.1.91"

 
 #include "fmacros.h"
 #include "config.h"
 
 #include "fmacros.h"
 #include "config.h"


@@ -1802,7 +1802,7 @@ static void replicationFeedSlaves(list *slaves, struct redisCommand *cmd, int di
 
             lenobj = createObject(REDIS_STRING,
                 sdscatprintf(sdsempty(),"%lu\r\n",
 
             lenobj = createObject(REDIS_STRING,
                 sdscatprintf(sdsempty(),"%lu\r\n",

-                    stringObjectLen(argv[j])));
+                    (unsigned long) stringObjectLen(argv[j])));

             lenobj->refcount = 0;
             outv[outc++] = lenobj;
         }
             lenobj->refcount = 0;
             outv[outc++] = lenobj;
         }


@@ -2019,7 +2019,7 @@ static void addReplyDouble(redisClient *c, double d) {
 
     snprintf(buf,sizeof(buf),"%.17g",d);
     addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n%s\r\n",
 
     snprintf(buf,sizeof(buf),"%.17g",d);
     addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n%s\r\n",

-        strlen(buf),buf));
+        (unsigned long) strlen(buf),buf));

 }
 
 static void addReplyBulkLen(redisClient *c, robj *obj) {
 }
 
 static void addReplyBulkLen(redisClient *c, robj *obj) {


@@ -2039,7 +2039,7 @@ static void addReplyBulkLen(redisClient *c, robj *obj) {
             len++;
         }
     }
             len++;
         }
     }

-    addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",len));
+    addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",(unsigned long)len));

 }
 
 static void acceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
 }
 
 static void acceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) {


@@ -5125,7 +5125,8 @@ static sds genRedisInfoString(void) {
 
 static void infoCommand(redisClient *c) {
     sds info = genRedisInfoString();
 
 static void infoCommand(redisClient *c) {
     sds info = genRedisInfoString();

-    addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",sdslen(info)));
+    addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",
+        (unsigned long)sdslen(info)));

     addReplySds(c,info);
     addReply(c,shared.crlf);
 }
     addReplySds(c,info);
     addReply(c,shared.crlf);
 }


@@ -5668,7 +5669,7 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
 
         snprintf(seldb,sizeof(seldb),"%d",dictid);
         buf = sdscatprintf(buf,"*2\r\n$6\r\nSELECT\r\n$%lu\r\n%s\r\n",
 
         snprintf(seldb,sizeof(seldb),"%d",dictid);
         buf = sdscatprintf(buf,"*2\r\n$6\r\nSELECT\r\n$%lu\r\n%s\r\n",

-            strlen(seldb),seldb);
+            (unsigned long)strlen(seldb),seldb);

         server.appendseldb = dictid;
     }
 
         server.appendseldb = dictid;
     }
 


@@ -5692,7 +5693,7 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
         robj *o = argv[j];
 
         o = getDecodedObject(o);
         robj *o = argv[j];
 
         o = getDecodedObject(o);

-        buf = sdscatprintf(buf,"$%lu\r\n",sdslen(o->ptr));
+        buf = sdscatprintf(buf,"$%lu\r\n",(unsigned long)sdslen(o->ptr));

         buf = sdscatlen(buf,o->ptr,sdslen(o->ptr));
         buf = sdscatlen(buf,"\r\n",2);
         decrRefCount(o);
         buf = sdscatlen(buf,o->ptr,sdslen(o->ptr));
         buf = sdscatlen(buf,"\r\n",2);
         decrRefCount(o);