Fixed Issue 83:Using TYPE on a zset results in a malformed response from the Redis...

diff --git a/redis.c b/redis.c
index d6d2e449f8684f47acf76640678e73d16b4bc99f..da7937ad93c14fae6ac22aab0fab7ad26fc870a0 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -3105,6 +3105,7 @@ static void typeCommand(redisClient *c) {
         case REDIS_STRING: type = "+string"; break;
         case REDIS_LIST: type = "+list"; break;
         case REDIS_SET: type = "+set"; break;
+        case REDIS_ZSET: type = "+zset"; break;
         default: type = "unknown"; break;
         }
     }

diff --git a/zmalloc.c b/zmalloc.c
index d453238136dcd87078c02c534ca21021c3e6fd1d..eb06da3b8925ab52e1c1d981c8ab2106e695433c 100644 (file)
--- a/zmalloc.c
+++ b/zmalloc.c
@@ -42,7 +42,7 @@
 static size_t used_memory = 0;
 
 static void zmalloc_oom(size_t size) {
-    fprintf(stderr, "zmalloc: Out of memory trying to allocate %lu bytes\n",
+    fprintf(stderr, "zmalloc: Out of memory trying to allocate %zu bytes\n",
         size);
     fflush(stderr);
     abort();