提交 ba5b4bde 编写于 作者: P Pieter Noordhuis

rename ziplistDelete to ziplistDeleteRange

上级 779deb60
...@@ -130,8 +130,8 @@ unsigned char *ziplistNext(unsigned char *p, unsigned char **entry, unsigned int ...@@ -130,8 +130,8 @@ unsigned char *ziplistNext(unsigned char *p, unsigned char **entry, unsigned int
return p; return p;
} }
/* Delete one or more entries from the ziplist. */ /* Delete a range of entries from the ziplist. */
unsigned char *ziplistDelete(unsigned char *zl, unsigned int index, unsigned int num) { unsigned char *ziplistDeleteRange(unsigned char *zl, unsigned int index, unsigned int num) {
unsigned char *p, *first = ziplistIndex(zl, index); unsigned char *p, *first = ziplistIndex(zl, index);
unsigned int i, deleted = 0, totlen, newlen; unsigned int i, deleted = 0, totlen, newlen;
for (p = first, i = 0; *p != ZIP_END && i < num; i++) { for (p = first, i = 0; *p != ZIP_END && i < num; i++) {
...@@ -245,35 +245,35 @@ int main(int argc, char **argv) { ...@@ -245,35 +245,35 @@ int main(int argc, char **argv) {
printf("Delete inclusive range 0,0:\n"); printf("Delete inclusive range 0,0:\n");
{ {
zl = createList(); zl = createList();
zl = ziplistDelete(zl, 0, 1); zl = ziplistDeleteRange(zl, 0, 1);
ziplistRepr(zl); ziplistRepr(zl);
} }
printf("Delete inclusive range 0,1:\n"); printf("Delete inclusive range 0,1:\n");
{ {
zl = createList(); zl = createList();
zl = ziplistDelete(zl, 0, 2); zl = ziplistDeleteRange(zl, 0, 2);
ziplistRepr(zl); ziplistRepr(zl);
} }
printf("Delete inclusive range 1,2:\n"); printf("Delete inclusive range 1,2:\n");
{ {
zl = createList(); zl = createList();
zl = ziplistDelete(zl, 1, 2); zl = ziplistDeleteRange(zl, 1, 2);
ziplistRepr(zl); ziplistRepr(zl);
} }
printf("Delete with start index out of range:\n"); printf("Delete with start index out of range:\n");
{ {
zl = createList(); zl = createList();
zl = ziplistDelete(zl, 5, 1); zl = ziplistDeleteRange(zl, 5, 1);
ziplistRepr(zl); ziplistRepr(zl);
} }
printf("Delete with num overflow:\n"); printf("Delete with num overflow:\n");
{ {
zl = createList(); zl = createList();
zl = ziplistDelete(zl, 1, 5); zl = ziplistDeleteRange(zl, 1, 5);
ziplistRepr(zl); ziplistRepr(zl);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册