diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-05-28 22:29:58 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2011-05-29 11:49:46 +0300 |
| commit | 7c036b9ca33c67fa8530d886e2072e264fcba6df (patch) | |
| tree | 171020b21e82136aa037b123fd60b43be4eaf365 /lib/rpmdb.c | |
| parent | d26080fa88d695396068543c7be88c9ffbf2307c (diff) | |
| download | librpm-tizen-7c036b9ca33c67fa8530d886e2072e264fcba6df.tar.gz librpm-tizen-7c036b9ca33c67fa8530d886e2072e264fcba6df.tar.bz2 librpm-tizen-7c036b9ca33c67fa8530d886e2072e264fcba6df.zip | |
Eliminate dead NULL-assignments at scope-end in librpm, part V
- Remove NULL-assignments of local variables at the end of scope
in transaction and database code
Diffstat (limited to 'lib/rpmdb.c')
| -rw-r--r-- | lib/rpmdb.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/rpmdb.c b/lib/rpmdb.c index 6511bdacb..5f5d9b44d 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -514,13 +514,13 @@ int rpmdbCheckTerminate(int terminate) while ((mi = rpmmiRock) != NULL) { rpmmiRock = mi->mi_next; mi->mi_next = NULL; - mi = rpmdbFreeIterator(mi); + rpmdbFreeIterator(mi); } while ((ii = rpmiiRock) != NULL) { rpmiiRock = ii->ii_next; ii->ii_next = NULL; - ii = rpmdbIndexIteratorFree(ii); + rpmdbIndexIteratorFree(ii); } while ((db = rpmdbRock) != NULL) { @@ -927,7 +927,7 @@ static int rpmdbFindByFile(rpmdb db, const char * filespec, rpmtdFreeData(&bn); rpmtdFreeData(&dn); rpmtdFreeData(&di); - h = headerFree(h); + headerFree(h); } fpCacheFree(fpc); @@ -1061,7 +1061,7 @@ static rpmRC dbiFindMatches(rpmdb db, dbiIndex dbi, dbiCursor dbc, (*matches)->recs[gotMatches++] = (*matches)->recs[i]; else (*matches)->recs[i].hdrNum = 0; - mi = rpmdbFreeIterator(mi); + rpmdbFreeIterator(mi); } if (gotMatches) { @@ -1467,7 +1467,7 @@ int rpmdbSetIteratorRE(rpmdbMatchIterator mi, rpmTagVal tag, defmode = RPMMIRE_GLOB; else defmode = RPMMIRE_DEFAULT; - t = _free(t); + free(t); } if (mi == NULL || pattern == NULL) @@ -2457,7 +2457,7 @@ cont: (void) unblockSignals(&signalMask); - h = headerFree(h); + headerFree(h); /* XXX return ret; */ return 0; @@ -2874,7 +2874,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts, { Header nh = (headerIsEntry(h, RPMTAG_HEADERIMAGE) ? headerCopy(h) : NULL); rc = rpmdbAdd(newdb, (nh ? nh : h)); - nh = headerFree(nh); + headerFree(nh); } if (rc) { @@ -2885,7 +2885,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts, } } - mi = rpmdbFreeIterator(mi); + rpmdbFreeIterator(mi); } |