replaced redisAssert() with redisAssertWithInfo() in a shitload of places.

[redis.git] / src / rdb.c

diff --git a/src/rdb.c b/src/rdb.c
index be369636d4b4f035fb3feb14d164780f1d0d85ae..1cfcd0449af10f370b52da427d1af8ebf2397506 100644 (file)
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -284,7 +284,7 @@ int rdbSaveStringObject(rio *rdb, robj *obj) {
     if (obj->encoding == REDIS_ENCODING_INT) {
         return rdbSaveLongLongAsStringObject(rdb,(long)obj->ptr);
     } else {
     if (obj->encoding == REDIS_ENCODING_INT) {
         return rdbSaveLongLongAsStringObject(rdb,(long)obj->ptr);
     } else {

-        redisAssert(obj->encoding == REDIS_ENCODING_RAW);
+        redisAssertWithInfo(NULL,obj,obj->encoding == REDIS_ENCODING_RAW);

         return rdbSaveRawString(rdb,obj->ptr,sdslen(obj->ptr));
     }
 }
         return rdbSaveRawString(rdb,obj->ptr,sdslen(obj->ptr));
     }
 }


@@ -553,7 +553,7 @@ int rdbSaveObject(rio *rdb, robj *o) {
  * we could switch to a faster solution. */
 off_t rdbSavedObjectLen(robj *o) {
     int len = rdbSaveObject(NULL,o);
  * we could switch to a faster solution. */
 off_t rdbSavedObjectLen(robj *o) {
     int len = rdbSaveObject(NULL,o);

-    redisAssert(len != -1);
+    redisAssertWithInfo(NULL,o,len != -1);

     return len;
 }
 
     return len;
 }