fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

rename argument names to s* to disambiguate from e*

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-05-29 16:26:55 +02:00
parent c8d9e7f4c0
commit 03e52931dd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ziplist.c
View File

@ -384,20 +384,20 @@ unsigned char *ziplistNext(unsigned char *p) {
* 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 zipmap, 1 otherwise. */
unsigned int ziplistGet(unsigned char *p, unsigned char **e, unsigned int *elen, long long *v) { unsigned int ziplistGet(unsigned char *p, unsigned char **sstr, unsigned int *slen, long long *sval) {
zlentry entry; zlentry entry;
if (*p == ZIP_END) return 0; if (*p == ZIP_END) return 0;
if (e) *e = NULL; if (sstr) *sstr = NULL;
entry = zipEntry(p); entry = zipEntry(p);
if (entry.encoding == ZIP_ENC_RAW) { if (entry.encoding == ZIP_ENC_RAW) {
if (e) { if (sstr) {
*elen = entry.len; *slen = entry.len;
*e = p+entry.headersize; *sstr = p+entry.headersize;
} }
} else { } else {
if (v) { if (sval) {
*v = zipLoadInteger(p+entry.headersize,entry.encoding); *sval = zipLoadInteger(p+entry.headersize,entry.encoding);
} }
} }
return 1; return 1;
@ -446,7 +446,7 @@ unsigned char *ziplistDelete(unsigned char *zl, unsigned char **p) {
} }
/* Compare entry pointer to by 'p' with 'entry'. Return 1 if equal. */ /* Compare entry pointer to by 'p' with 'entry'. Return 1 if equal. */
unsigned int ziplistCompare(unsigned char *p, unsigned char *s, unsigned int slen) { unsigned int ziplistCompare(unsigned char *p, unsigned char *sstr, unsigned int slen) {
zlentry entry; zlentry entry;
unsigned char sencoding; unsigned char sencoding;
long long val, sval; long long val, sval;
@ -456,13 +456,13 @@ unsigned int ziplistCompare(unsigned char *p, unsigned char *s, unsigned int sle
if (entry.encoding == ZIP_ENC_RAW) { if (entry.encoding == ZIP_ENC_RAW) {
/* Raw compare */ /* Raw compare */
if (entry.len == slen) { if (entry.len == slen) {
return memcmp(p+entry.headersize,s,slen) == 0; return memcmp(p+entry.headersize,sstr,slen) == 0;
} else { } else {
return 0; return 0;
} }
} else { } else {
/* Try to compare encoded values */ /* Try to compare encoded values */
if (zipTryEncoding(s,&sval,&sencoding)) { if (zipTryEncoding(sstr,&sval,&sencoding)) {
if (entry.encoding == sencoding) { if (entry.encoding == sencoding) {
val = zipLoadInteger(p+entry.headersize,entry.encoding); val = zipLoadInteger(p+entry.headersize,entry.encoding);
return val == sval; return val == sval;