rdbLoad() should check REDIS_RDB_VERSION instead of hardcoded number.

[redis.git] / src / zipmap.c

diff --git a/src/zipmap.c b/src/zipmap.c
index 9f0fc71815819ea17605ebd904ee4e6ed8157ac0..1f11fd429ea016a303a04cf6d78645bb1d8fa60f 100644 (file)
--- a/src/zipmap.c
+++ b/src/zipmap.c
@@ -80,7 +80,7 @@
 #include <string.h>
 #include <assert.h>
 #include "zmalloc.h"
-#include "endian.h"
+#include "endianconv.h"
 
 #define ZIPMAP_BIGLEN 254
 #define ZIPMAP_END 255
@@ -298,7 +298,7 @@ unsigned char *zipmapDel(unsigned char *zm, unsigned char *key, unsigned int kle
     return zm;
 }
 
-/* Call it before to iterate trought elements via zipmapNext() */
+/* Call before iterating through elements via zipmapNext() */
 unsigned char *zipmapRewind(unsigned char *zm) {
     return zm+1;
 }
@@ -452,7 +452,7 @@ int main(void) {
                 vlen, vlen, value);
         }
     }
-    printf("\nIterate trought elements:\n");
+    printf("\nIterate through elements:\n");
     {
         unsigned char *i = zipmapRewind(zm);
         unsigned char *key, *value;