Return explicit NULL's from db iterator free functions for clarity
authorPanu Matilainen <pmatilai@redhat.com>
Tue, 19 Apr 2011 10:46:41 +0000 (13:46 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Tue, 19 Apr 2011 11:55:43 +0000 (14:55 +0300)
lib/rpmdb.c

index b6007fa..3c03a35 100644 (file)
@@ -1289,7 +1289,7 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi)
 
     (void) rpmdbCheckSignals();
 
-    return mi;
+    return NULL;
 }
 
 unsigned int rpmdbGetIteratorOffset(rpmdbMatchIterator mi) {
@@ -2269,7 +2269,7 @@ rpmdbIndexIterator rpmdbIndexIteratorFree(rpmdbIndexIterator ii)
     rpmdbIndexIterator * prev, next;
 
     if (ii == NULL)
-        return ii;
+        return NULL;
 
     prev = &rpmiiRock;
     while ((next = *prev) != NULL && next != ii)
@@ -2287,12 +2287,9 @@ rpmdbIndexIterator rpmdbIndexIteratorFree(rpmdbIndexIterator ii)
     ii->ii_set = dbiFreeIndexSet(ii->ii_set);
 
     ii = _free(ii);
-    return ii;
+    return NULL;
 }
 
-
-
-
 static void logAddRemove(const char *dbiname, int removing, rpmtd tagdata)
 {
     rpm_count_t c = rpmtdCount(tagdata);