From: antirez Date: Thu, 26 Aug 2010 16:11:26 +0000 (+0200) Subject: translated a few long logn into int64_t for correctness and to avoid compilation... X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/23c64fe50ddbc01f825ebe64f1a8b5f14c584327 translated a few long logn into int64_t for correctness and to avoid compilation warnings as well --- diff --git a/src/aof.c b/src/aof.c index dc806969..8f2dc96f 100644 --- 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; - 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; diff --git a/src/rdb.c b/src/rdb.c index 12221b9f..96c5a09d 100644 --- 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; - long long llval; + int64_t llval; int i = 0; if (rdbSaveLen(fp,intsetLen(is)) == -1) return -1; diff --git a/src/t_set.c b/src/t_set.c index cb06a6a2..97fc5bf4 100644 --- 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) { - long long llval; + int64_t llval; if (intsetGet(si->subject->ptr,si->ii++,&llval)) ret = createStringObjectFromLongLong(llval); }