Rename iterator to setTypeIterator for consistency

diff --git a/src/debug.c b/src/debug.c
index f58fcbaeb3bed8e45933a5688c488a4de62798c6..76d18b214964170a6162636f26cd591063f4ff04 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -119,7 +119,7 @@ void computeDatasetDigest(unsigned char *final) {
                 }
                 listTypeReleaseIterator(li);
             } else if (o->type == REDIS_SET) {
                 }
                 listTypeReleaseIterator(li);
             } else if (o->type == REDIS_SET) {

-                setIterator *si = setTypeInitIterator(o);
+                setTypeIterator *si = setTypeInitIterator(o);

                 robj *ele;
                 while((ele = setTypeNext(si)) != NULL) {
                     xorObjectDigest(digest,ele);
                 robj *ele;
                 while((ele = setTypeNext(si)) != NULL) {
                     xorObjectDigest(digest,ele);

diff --git a/src/redis.h b/src/redis.h
index 288c90697f6cf57784d6cd2989c02f333a09b43c..0b78320c117db7ad0d304afcfb075ff26b650a86 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -545,7 +545,7 @@ typedef struct {
     int encoding;
     int ii; /* intset iterator */
     dictIterator *di;
     int encoding;
     int ii; /* intset iterator */
     dictIterator *di;

-} setIterator;
+} setTypeIterator;

 
 /* Structure to hold hash iteration abstration. Note that iteration over
  * hashes involves both fields and values. Because it is possible that
 
 /* Structure to hold hash iteration abstration. Note that iteration over
  * hashes involves both fields and values. Because it is possible that


@@ -734,9 +734,9 @@ robj *setTypeCreate(robj *value);
 int setTypeAdd(robj *subject, robj *value);
 int setTypeRemove(robj *subject, robj *value);
 int setTypeIsMember(robj *subject, robj *value);
 int setTypeAdd(robj *subject, robj *value);
 int setTypeRemove(robj *subject, robj *value);
 int setTypeIsMember(robj *subject, robj *value);

-setIterator *setTypeInitIterator(robj *subject);
-void setTypeReleaseIterator(setIterator *si);
-robj *setTypeNext(setIterator *si);
+setTypeIterator *setTypeInitIterator(robj *subject);
+void setTypeReleaseIterator(setTypeIterator *si);
+robj *setTypeNext(setTypeIterator *si);

 robj *setTypeRandomElement(robj *subject);
 unsigned long setTypeSize(robj *subject);
 void setTypeConvert(robj *subject, int enc);
 robj *setTypeRandomElement(robj *subject);
 unsigned long setTypeSize(robj *subject);
 void setTypeConvert(robj *subject, int enc);

diff --git a/src/sort.c b/src/sort.c
index 06696cc5312cc08221505dc67f10075e4bfd45d5..aa1ce929399dc64bfdbcccda95f1db3ae1b2c9c6 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -220,7 +220,7 @@ void sortCommand(redisClient *c) {
         }
         listTypeReleaseIterator(li);
     } else if (sortval->type == REDIS_SET) {
         }
         listTypeReleaseIterator(li);
     } else if (sortval->type == REDIS_SET) {

-        setIterator *si = setTypeInitIterator(sortval);
+        setTypeIterator *si = setTypeInitIterator(sortval);

         robj *ele;
         while((ele = setTypeNext(si)) != NULL) {
             vector[j].obj = ele;
         robj *ele;
         while((ele = setTypeNext(si)) != NULL) {
             vector[j].obj = ele;

diff --git a/src/t_set.c b/src/t_set.c
index bcb8dd3f1932082cd77e7ba95253b07f27deacb4..01c851ba9ffe2c6d239ede95bf01a94509748d12 100644 (file)
--- a/src/t_set.c
+++ b/src/t_set.c
@@ -80,8 +80,8 @@ int setTypeIsMember(robj *subject, robj *value) {
     return 0;
 }
 
     return 0;
 }
 

-setIterator *setTypeInitIterator(robj *subject) {
-    setIterator *si = zmalloc(sizeof(setIterator));
+setTypeIterator *setTypeInitIterator(robj *subject) {
+    setTypeIterator *si = zmalloc(sizeof(setIterator));

     si->subject = subject;
     si->encoding = subject->encoding;
     if (si->encoding == REDIS_ENCODING_HT) {
     si->subject = subject;
     si->encoding = subject->encoding;
     if (si->encoding == REDIS_ENCODING_HT) {


@@ -94,7 +94,7 @@ setIterator *setTypeInitIterator(robj *subject) {
     return si;
 }
 
     return si;
 }
 

-void setTypeReleaseIterator(setIterator *si) {
+void setTypeReleaseIterator(setTypeIterator *si) {

     if (si->encoding == REDIS_ENCODING_HT)
         dictReleaseIterator(si->di);
     zfree(si);
     if (si->encoding == REDIS_ENCODING_HT)
         dictReleaseIterator(si->di);
     zfree(si);


@@ -103,7 +103,7 @@ void setTypeReleaseIterator(setIterator *si) {
 /* Move to the next entry in the set. Returns the object at the current
  * position, or NULL when the end is reached. This object will have its
  * refcount incremented, so the caller needs to take care of this. */
 /* Move to the next entry in the set. Returns the object at the current
  * position, or NULL when the end is reached. This object will have its
  * refcount incremented, so the caller needs to take care of this. */

-robj *setTypeNext(setIterator *si) {
+robj *setTypeNext(setTypeIterator *si) {

     robj *ret = NULL;
     if (si->encoding == REDIS_ENCODING_HT) {
         dictEntry *de = dictNext(si->di);
     robj *ret = NULL;
     if (si->encoding == REDIS_ENCODING_HT) {
         dictEntry *de = dictNext(si->di);


@@ -151,7 +151,7 @@ unsigned long setTypeSize(robj *subject) {
  * to a hashtable) is presized to hold the number of elements in the original
  * set. */
 void setTypeConvert(robj *subject, int enc) {
  * to a hashtable) is presized to hold the number of elements in the original
  * set. */
 void setTypeConvert(robj *subject, int enc) {

-    setIterator *si;
+    setTypeIterator *si;

     robj *element;
     redisAssert(subject->type == REDIS_SET);
 
     robj *element;
     redisAssert(subject->type == REDIS_SET);
 


@@ -319,7 +319,7 @@ int qsortCompareSetsByCardinality(const void *s1, const void *s2) {
 
 void sinterGenericCommand(redisClient *c, robj **setkeys, unsigned long setnum, robj *dstkey) {
     robj **sets = zmalloc(sizeof(robj*)*setnum);
 
 void sinterGenericCommand(redisClient *c, robj **setkeys, unsigned long setnum, robj *dstkey) {
     robj **sets = zmalloc(sizeof(robj*)*setnum);

-    setIterator *si;
+    setTypeIterator *si;

     robj *ele, *lenobj = NULL, *dstset = NULL;
     unsigned long j, cardinality = 0;
 
     robj *ele, *lenobj = NULL, *dstset = NULL;
     unsigned long j, cardinality = 0;
 


@@ -419,7 +419,7 @@ void sinterstoreCommand(redisClient *c) {
 
 void sunionDiffGenericCommand(redisClient *c, robj **setkeys, int setnum, robj *dstkey, int op) {
     robj **sets = zmalloc(sizeof(robj*)*setnum);
 
 void sunionDiffGenericCommand(redisClient *c, robj **setkeys, int setnum, robj *dstkey, int op) {
     robj **sets = zmalloc(sizeof(robj*)*setnum);

-    setIterator *si;
+    setTypeIterator *si;

     robj *ele, *dstset = NULL;
     int j, cardinality = 0;
 
     robj *ele, *dstset = NULL;
     int j, cardinality = 0;