caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Inverted variable boolean value and name after scanGenericCommand() refactoring.

Browse Source
This commit is contained in:
antirez 2013-10-31 10:35:56 +01:00
parent 8fc85a1218
commit c4ca5f99bf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/db.c
View File

@ -370,7 +370,7 @@ void scanGenericCommand(redisClient *c, robj *o) {
unsigned long cursor = 0; unsigned long cursor = 0;
long count = 10; long count = 10;
sds pat; sds pat;
int patlen, patnoop = 1; int patlen, use_pattern = 0;
dict *ht; dict *ht;
/* Object must be NULL (to iterate keys names), or the type of the object /* Object must be NULL (to iterate keys names), or the type of the object
@ -408,8 +408,9 @@ void scanGenericCommand(redisClient *c, robj *o) {
pat = c->argv[i+1]->ptr; pat = c->argv[i+1]->ptr;
patlen = sdslen(pat); patlen = sdslen(pat);
/* The pattern is a no-op iff == "*" */ /* The pattern always matches if it is exactly "*", so it is
patnoop = (pat[0] == '*' && patlen == 1); * equivalent to disabling it. */
use_pattern = !(pat[0] == '*' && patlen == 1);
i += 2; i += 2;
} else { } else {
@ -483,7 +484,7 @@ void scanGenericCommand(redisClient *c, robj *o) {
int filter = 0; int filter = 0;
/* Filter element if it does not match the pattern. */ /* Filter element if it does not match the pattern. */
if (!filter && !patnoop) { if (!filter && use_pattern) {
if (sdsEncodedObject(kobj)) { if (sdsEncodedObject(kobj)) {
if (!stringmatchlen(pat, patlen, kobj->ptr, sdslen(kobj->ptr), 0)) if (!stringmatchlen(pat, patlen, kobj->ptr, sdslen(kobj->ptr), 0))
filter = 1; filter = 1;