Make redis-cli help a little better

[redis.git] / src / debug.c

diff --git a/src/debug.c b/src/debug.c
index b364dd1635ad9acef4569d486ef77d331aa5f967..fff8d7277f8728ded6d1a37ef5c4f012edb7232d 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -121,7 +121,7 @@ void computeDatasetDigest(unsigned char *final) {
             } else if (o->type == REDIS_SET) {
                 setTypeIterator *si = setTypeInitIterator(o);
                 robj *ele;
             } else if (o->type == REDIS_SET) {
                 setTypeIterator *si = setTypeInitIterator(o);
                 robj *ele;

-                while((ele = setTypeNext(si)) != NULL) {
+                while((ele = setTypeNextObject(si)) != NULL) {

                     xorObjectDigest(digest,ele);
                     decrRefCount(ele);
                 }
                     xorObjectDigest(digest,ele);
                     decrRefCount(ele);
                 }


@@ -152,10 +152,10 @@ void computeDatasetDigest(unsigned char *final) {
                     unsigned char eledigest[20];
 
                     memset(eledigest,0,20);
                     unsigned char eledigest[20];
 
                     memset(eledigest,0,20);

-                    obj = hashTypeCurrent(hi,REDIS_HASH_KEY);
+                    obj = hashTypeCurrentObject(hi,REDIS_HASH_KEY);

                     mixObjectDigest(eledigest,obj);
                     decrRefCount(obj);
                     mixObjectDigest(eledigest,obj);
                     decrRefCount(obj);

-                    obj = hashTypeCurrent(hi,REDIS_HASH_VALUE);
+                    obj = hashTypeCurrentObject(hi,REDIS_HASH_VALUE);

                     mixObjectDigest(eledigest,obj);
                     decrRefCount(obj);
                     xorDigest(digest,eledigest,20);
                     mixObjectDigest(eledigest,obj);
                     decrRefCount(obj);
                     xorDigest(digest,eledigest,20);


@@ -216,7 +216,7 @@ void debugCommand(redisClient *c) {
                 "encoding:%s serializedlength:%lld "
                 "lru:%d lru_seconds_idle:%lu",
                 (void*)val, val->refcount,
                 "encoding:%s serializedlength:%lld "
                 "lru:%d lru_seconds_idle:%lu",
                 (void*)val, val->refcount,

-                strenc, (long long) rdbSavedObjectLen(val,NULL),
+                strenc, (long long) rdbSavedObjectLen(val),

                 val->lru, estimateObjectIdleTime(val));
         } else {
             vmpointer *vp = (vmpointer*) val;
                 val->lru, estimateObjectIdleTime(val));
         } else {
             vmpointer *vp = (vmpointer*) val;