translated a few long logn into int64_t for correctness and to avoid compilation...

diff --git a/src/aof.c b/src/aof.c
index dc806969d5ba5d517e96e38dab67583263bfaf14..8f2dc96f3cd5a22ad0641b3593d5c03ea995d4ce 100644 (file)
--- a/src/aof.c
+++ b/src/aof.c
@@ -468,7 +468,7 @@ int rewriteAppendOnlyFile(char *filename) {
                 /* Emit the SADDs needed to rebuild the set */
                 if (o->encoding == REDIS_ENCODING_INTSET) {
                     int ii = 0;
                 /* Emit the SADDs needed to rebuild the set */
                 if (o->encoding == REDIS_ENCODING_INTSET) {
                     int ii = 0;

-                    long long llval;
+                    int64_t llval;

                     while(intsetGet(o->ptr,ii++,&llval)) {
                         if (fwrite(cmd,sizeof(cmd)-1,1,fp) == 0) goto werr;
                         if (fwriteBulkObject(fp,&key) == 0) goto werr;
                     while(intsetGet(o->ptr,ii++,&llval)) {
                         if (fwrite(cmd,sizeof(cmd)-1,1,fp) == 0) goto werr;
                         if (fwriteBulkObject(fp,&key) == 0) goto werr;

diff --git a/src/rdb.c b/src/rdb.c
index 12221b9f3f94189fd4408fee9650e97da701cb69..96c5a09d21f5b591d36fdb9081e71c6affcbf865 100644 (file)
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -273,7 +273,7 @@ int rdbSaveObject(FILE *fp, robj *o) {
             dictReleaseIterator(di);
         } else if (o->encoding == REDIS_ENCODING_INTSET) {
             intset *is = o->ptr;
             dictReleaseIterator(di);
         } else if (o->encoding == REDIS_ENCODING_INTSET) {
             intset *is = o->ptr;

-            long long llval;
+            int64_t llval;

             int i = 0;
 
             if (rdbSaveLen(fp,intsetLen(is)) == -1) return -1;
             int i = 0;
 
             if (rdbSaveLen(fp,intsetLen(is)) == -1) return -1;

diff --git a/src/t_set.c b/src/t_set.c
index cb06a6a2e9ee43ba4189189da4107b341350ce83..97fc5bf4534f9a5ade43ad6c33ad92a9c107ebb3 100644 (file)
--- a/src/t_set.c
+++ b/src/t_set.c
@@ -112,7 +112,7 @@ robj *setTypeNext(setTypeIterator *si) {
             incrRefCount(ret);
         }
     } else if (si->encoding == REDIS_ENCODING_INTSET) {
             incrRefCount(ret);
         }
     } else if (si->encoding == REDIS_ENCODING_INTSET) {

-        long long llval;
+        int64_t llval;

         if (intsetGet(si->subject->ptr,si->ii++,&llval))
             ret = createStringObjectFromLongLong(llval);
     }
         if (intsetGet(si->subject->ptr,si->ii++,&llval))
             ret = createStringObjectFromLongLong(llval);
     }