Merge branch 'unstable' of github.com:/antirez/redis into unstable

This commit is contained in:
antirez 2014-12-12 22:57:29 +01:00
commit f2858dc8dc

View File

@ -450,8 +450,8 @@ void scanGenericCommand(redisClient *c, robj *o, unsigned long cursor) {
list *keys = listCreate(); list *keys = listCreate();
listNode *node, *nextnode; listNode *node, *nextnode;
long count = 10; long count = 10;
sds pat; sds pat = NULL;
int patlen, use_pattern = 0; int patlen = 0, 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