summaryrefslogtreecommitdiff
path: root/src/db.c
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2013-10-25 11:54:37 +0200
committerantirez <antirez@gmail.com>2013-10-25 11:54:45 +0200
commitfd1b0ad07c945954b35a2577b113ddc03da67744 (patch)
tree83c09c756e7001a64efc3564a7750c54e430c28c /src/db.c
parent908eba5a8fd88354e9254cc312b0013ccf60121c (diff)
downloadredis-fd1b0ad07c945954b35a2577b113ddc03da67744.tar.gz
SCAN: improve variable names for readability.
Diffstat (limited to 'src/db.c')
-rw-r--r--src/db.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/db.c b/src/db.c
index d8bc1943e..9bf135613 100644
--- a/src/db.c
+++ b/src/db.c
@@ -331,7 +331,7 @@ void scanCommand(redisClient *c) {
int i, j;
char buf[REDIS_LONGSTR_SIZE];
list *keys = listCreate();
- listNode *ln, *ln_;
+ listNode *node, *nextnode;
unsigned long cursor = 0;
long count = 1;
sds pat;
@@ -377,10 +377,10 @@ void scanCommand(redisClient *c) {
} while (cursor && listLength(keys) < count);
/* Filter keys */
- ln = listFirst(keys);
- while (ln) {
- robj *kobj = listNodeValue(ln);
- ln_ = listNextNode(ln);
+ node = listFirst(keys);
+ while (node) {
+ robj *kobj = listNodeValue(node);
+ nextnode = listNextNode(node);
/* Keep key iff pattern matches and it hasn't expired */
if ((patnoop || stringmatchlen(pat, patlen, kobj->ptr, sdslen(kobj->ptr), 0)) &&
@@ -389,9 +389,9 @@ void scanCommand(redisClient *c) {
/* Keep */
} else {
decrRefCount(kobj);
- listDelNode(keys, ln);
+ listDelNode(keys, node);
}
- ln = ln_;
+ node = nextnode;
}
addReplyMultiBulkLen(c, 2);
@@ -400,18 +400,18 @@ void scanCommand(redisClient *c) {
addReplyBulkCBuffer(c, buf, rv);
addReplyMultiBulkLen(c, listLength(keys));
- while ((ln = listFirst(keys)) != NULL) {
- robj *kobj = listNodeValue(ln);
+ while ((node = listFirst(keys)) != NULL) {
+ robj *kobj = listNodeValue(node);
addReplyBulk(c, kobj);
decrRefCount(kobj);
- listDelNode(keys, ln);
+ listDelNode(keys, node);
}
cleanup:
- while ((ln = listFirst(keys)) != NULL) {
- robj *kobj = listNodeValue(ln);
+ while ((node = listFirst(keys)) != NULL) {
+ robj *kobj = listNodeValue(node);
decrRefCount(kobj);
- listDelNode(keys, ln);
+ listDelNode(keys, node);
}
listRelease(keys);
}