gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #914 from catwell/unstable

Browse Source 
fix comments forgotten in #285 (zipmap -> ziplist)
This commit is contained in:
Salvatore Sanfilippo 2013-01-31 03:37:48 -08:00
commit aca005c246
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/redis.c
View File

@ -539,7 +539,7 @@ dictType commandTableDictType = {
NULL /* val destructor */ NULL /* val destructor */
}; };
/* Hash type hash table (note that small hashes are represented with zipmaps) */ /* Hash type hash table (note that small hashes are represented with ziplists) */
dictType hashDictType = { dictType hashDictType = {
dictEncObjHash, /* hash function */ dictEncObjHash, /* hash function */
NULL, /* key dup */ NULL, /* key dup */

4
src/ziplist.c
View File

@ -739,10 +739,10 @@ unsigned char *ziplistPrev(unsigned char *zl, unsigned char *p) {
} }
} }
/* Get entry pointer to by 'p' and store in either 'e' or 'v' depending /* Get entry pointed to by 'p' and store in either 'e' or 'v' depending
* on the encoding of the entry. 'e' is always set to NULL to be able * on the encoding of the entry. 'e' is always set to NULL to be able
* to find out whether the string pointer or the integer value was set. * to find out whether the string pointer or the integer value was set.
* Return 0 if 'p' points to the end of the zipmap, 1 otherwise. */ * Return 0 if 'p' points to the end of the ziplist, 1 otherwise. */
unsigned int ziplistGet(unsigned char *p, unsigned char **sstr, unsigned int *slen, long long *sval) { unsigned int ziplistGet(unsigned char *p, unsigned char **sstr, unsigned int *slen, long long *sval) {
zlentry entry; zlentry entry;
if (p == NULL || p[0] == ZIP_END) return 0; if (p == NULL || p[0] == ZIP_END) return 0;