summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Stancliff <matt@genges.com>2014-11-13 16:12:09 -0500
committerMatt Stancliff <matt@genges.com>2014-12-23 09:31:03 -0500
commit53b1ee34ddba1446d81f2ce07c402db271a94674 (patch)
tree9b4d9cc97b89e4b25c88bd453a47c41a4499be92
parentfae53dea3333af7e5db1b26d7b7d4d5cea5a6d70 (diff)
downloadredis-53b1ee34ddba1446d81f2ce07c402db271a94674.tar.gz
Fix ziplistDeleteRange index parameter
It's valid to delete from negative offsets, so we *don't* want unsigned arguments here.
-rw-r--r--src/ziplist.c2
-rw-r--r--src/ziplist.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ziplist.c b/src/ziplist.c
index 8975e6305..7e8823f5a 100644
--- a/src/ziplist.c
+++ b/src/ziplist.c
@@ -781,7 +781,7 @@ unsigned char *ziplistDelete(unsigned char *zl, unsigned char **p) {
}
/* Delete a range of entries from the ziplist. */
-unsigned char *ziplistDeleteRange(unsigned char *zl, unsigned int index, unsigned int num) {
+unsigned char *ziplistDeleteRange(unsigned char *zl, int index, unsigned int num) {
unsigned char *p = ziplistIndex(zl,index);
return (p == NULL) ? zl : __ziplistDelete(zl,p,num);
}
diff --git a/src/ziplist.h b/src/ziplist.h
index bc27006aa..ef0e27140 100644
--- a/src/ziplist.h
+++ b/src/ziplist.h
@@ -39,7 +39,7 @@ unsigned char *ziplistPrev(unsigned char *zl, unsigned char *p);
unsigned int ziplistGet(unsigned char *p, unsigned char **sval, unsigned int *slen, long long *lval);
unsigned char *ziplistInsert(unsigned char *zl, unsigned char *p, unsigned char *s, unsigned int slen);
unsigned char *ziplistDelete(unsigned char *zl, unsigned char **p);
-unsigned char *ziplistDeleteRange(unsigned char *zl, unsigned int index, unsigned int num);
+unsigned char *ziplistDeleteRange(unsigned char *zl, int index, unsigned int num);
unsigned int ziplistCompare(unsigned char *p, unsigned char *s, unsigned int slen);
unsigned char *ziplistFind(unsigned char *p, unsigned char *vstr, unsigned int vlen, unsigned int skip);
unsigned int ziplistLen(unsigned char *zl);