X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/bab205f787afcb37e5b5a5d1eb16c8fafef6f95d..7dcc10b65e0075fccc90d93bac5b078baefdbb07:/src/debug.c diff --git a/src/debug.c b/src/debug.c index 05181912..2dfe2280 100644 --- a/src/debug.c +++ b/src/debug.c @@ -94,13 +94,13 @@ void computeDatasetDigest(unsigned char *final) { time_t expiretime; memset(digest,0,20); /* This key-val digest */ - key = dictGetEntryKey(de); + key = dictGetKey(de); keyobj = createStringObject(key,sdslen(key)); mixDigest(digest,key,sdslen(key)); /* Make sure the key is loaded if VM is active */ - o = dictGetEntryVal(de); + o = dictGetVal(de); aux = htonl(o->type); mixDigest(digest,&aux,sizeof(aux)); @@ -165,8 +165,8 @@ void computeDatasetDigest(unsigned char *final) { dictEntry *de; while((de = dictNext(di)) != NULL) { - robj *eleobj = dictGetEntryKey(de); - double *score = dictGetEntryVal(de); + robj *eleobj = dictGetKey(de); + double *score = dictGetVal(de); snprintf(buf,sizeof(buf),"%.17g",*score); memset(eledigest,0,20); @@ -222,7 +222,7 @@ void debugCommand(redisClient *c) { } emptyDb(); if (rdbLoad(server.dbfilename) != REDIS_OK) { - addReply(c,shared.err); + addReplyError(c,"Error trying to load the RDB dump"); return; } redisLog(REDIS_WARNING,"DB reloaded by DEBUG RELOAD"); @@ -244,7 +244,7 @@ void debugCommand(redisClient *c) { addReply(c,shared.nokeyerr); return; } - val = dictGetEntryVal(de); + val = dictGetVal(de); strenc = strEncoding(val->encoding); addReplyStatusFormat(c,