Merge pull request #544 from dvirsky/2.6

[redis.git] / src / zipmap.c

diff --git a/src/zipmap.c b/src/zipmap.c
index 65ed29c89ade473dc4fcb123de4780781cd2168c..d9b7c8b31e075393eff0e5410ecc8f9444bb9ebd 100644 (file)
--- a/src/zipmap.c
+++ b/src/zipmap.c
@@ -52,15 +52,15 @@
  * <len> lengths are encoded in a single value or in a 5 bytes value.
  * If the first byte value (as an unsigned 8 bit value) is between 0 and
  * 252, it's a single-byte length. If it is 253 then a four bytes unsigned
  * <len> lengths are encoded in a single value or in a 5 bytes value.
  * If the first byte value (as an unsigned 8 bit value) is between 0 and
  * 252, it's a single-byte length. If it is 253 then a four bytes unsigned

- * integer follows (in the host byte ordering). A value fo 255 is used to
+ * integer follows (in the host byte ordering). A value of 255 is used to

  * signal the end of the hash. The special value 254 is used to mark
  * empty space that can be used to add new key/value pairs.
  *
  * signal the end of the hash. The special value 254 is used to mark
  * empty space that can be used to add new key/value pairs.
  *

- * <free> is the number of free unused bytes
- * after the string, resulting from modification of values associated to a
- * key (for instance if "foo" is set to "bar', and later "foo" will be se to
- * "hi", I'll have a free byte to use if the value will enlarge again later,
- * or even in order to add a key/value pair if it fits.
+ * <free> is the number of free unused bytes after the string, resulting 
+ * from modification of values associated to a key. For instance if "foo"
+ * is set to "bar", and later "foo" will be set to "hi", it will have a
+ * free byte to use if the value will enlarge again later, or even in
+ * order to add a key/value pair if it fits.

  *
  * <free> is always an unsigned 8 bit number, because if after an
  * update operation there are more than a few free bytes, the zipmap will be
  *
  * <free> is always an unsigned 8 bit number, because if after an
  * update operation there are more than a few free bytes, the zipmap will be


@@ -80,7 +80,7 @@
 #include <string.h>
 #include <assert.h>
 #include "zmalloc.h"
 #include <string.h>
 #include <assert.h>
 #include "zmalloc.h"

-#include "endian.h"
+#include "endianconv.h"

 
 #define ZIPMAP_BIGLEN 254
 #define ZIPMAP_END 255
 
 #define ZIPMAP_BIGLEN 254
 #define ZIPMAP_END 255