Fix compiler warnings on Solaris

diff --git a/src/redis-cli.c b/src/redis-cli.c
index ca70c9472e4cb26416012a1bd0dabc3c8c8ff77a..08b3a713e3db0f6cdc7dcdd3ee05330676035897 100644 (file)
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -414,10 +414,11 @@ static sds cliFormatReplyRaw(redisReply *r) {
 }
 
 static int cliReadReply(int output_raw_strings) {
 }
 
 static int cliReadReply(int output_raw_strings) {

+    void *_reply;

     redisReply *reply;
     sds out;
 
     redisReply *reply;
     sds out;
 

-    if (redisGetReply(context,(void**)&reply) != REDIS_OK) {
+    if (redisGetReply(context,&_reply) != REDIS_OK) {

         if (config.shutdown)
             return REDIS_OK;
         if (config.interactive) {
         if (config.shutdown)
             return REDIS_OK;
         if (config.interactive) {


@@ -431,6 +432,7 @@ static int cliReadReply(int output_raw_strings) {
         return REDIS_ERR; /* avoid compiler warning */
     }
 
         return REDIS_ERR; /* avoid compiler warning */
     }
 

+    reply = (redisReply*)_reply;

     if (output_raw_strings) {
         out = cliFormatReplyRaw(reply);
     } else {
     if (output_raw_strings) {
         out = cliFormatReplyRaw(reply);
     } else {

diff --git a/src/redis.c b/src/redis.c
index 6e667f29a0b0e4648483d20e0814e0649254e616..8f4ca961945d6073d0a15ca095dd5077c08a281a 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1476,7 +1476,7 @@ void createPidFile(void) {
     /* Try to write the pid file in a best-effort way. */
     FILE *fp = fopen(server.pidfile,"w");
     if (fp) {
     /* Try to write the pid file in a best-effort way. */
     FILE *fp = fopen(server.pidfile,"w");
     if (fp) {

-        fprintf(fp,"%d\n",getpid());
+        fprintf(fp,"%d\n",(int)getpid());

         fclose(fp);
     }
 }
         fclose(fp);
     }
 }

diff --git a/src/ziplist.c b/src/ziplist.c
index a1a63478938e19a6c79349d6f533e437b9b9ee7f..233fabefe2276dce9be9d69c86e556f8fc819891 100644 (file)
--- a/src/ziplist.c
+++ b/src/ziplist.c
@@ -119,6 +119,7 @@ static unsigned int zipEntryEncoding(unsigned char *p) {
         return p[0] & 0xf0;
     }
     assert(NULL);
         return p[0] & 0xf0;
     }
     assert(NULL);

+    return 0;

 }
 
 /* Return bytes needed to store integer encoded by 'encoding' */
 }
 
 /* Return bytes needed to store integer encoded by 'encoding' */


@@ -129,13 +130,14 @@ static unsigned int zipIntSize(unsigned char encoding) {
     case ZIP_INT_64B: return sizeof(int64_t);
     }
     assert(NULL);
     case ZIP_INT_64B: return sizeof(int64_t);
     }
     assert(NULL);

+    return 0;

 }
 
 /* Decode the encoded length pointed by 'p'. If a pointer to 'lensize' is
  * provided, it is set to the number of bytes required to encode the length. */
 static unsigned int zipDecodeLength(unsigned char *p, unsigned int *lensize) {
     unsigned char encoding = zipEntryEncoding(p);
 }
 
 /* Decode the encoded length pointed by 'p'. If a pointer to 'lensize' is
  * provided, it is set to the number of bytes required to encode the length. */
 static unsigned int zipDecodeLength(unsigned char *p, unsigned int *lensize) {
     unsigned char encoding = zipEntryEncoding(p);

-    unsigned int len;
+    unsigned int len = 0;

 
     if (ZIP_IS_STR(encoding)) {
         switch(encoding) {
 
     if (ZIP_IS_STR(encoding)) {
         switch(encoding) {


@@ -300,7 +302,7 @@ static void zipSaveInteger(unsigned char *p, int64_t value, unsigned char encodi
 static int64_t zipLoadInteger(unsigned char *p, unsigned char encoding) {
     int16_t i16;
     int32_t i32;
 static int64_t zipLoadInteger(unsigned char *p, unsigned char encoding) {
     int16_t i16;
     int32_t i32;

-    int64_t i64, ret;
+    int64_t i64, ret = 0;

     if (encoding == ZIP_INT_16B) {
         memcpy(&i16,p,sizeof(i16));
         ret = i16;
     if (encoding == ZIP_INT_16B) {
         memcpy(&i16,p,sizeof(i16));
         ret = i16;