From 7c036b9ca33c67fa8530d886e2072e264fcba6df Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Sat, 28 May 2011 22:29:58 +0300 Subject: [PATCH] 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 --- lib/depends.c | 10 +++++----- lib/order.c | 4 ++-- lib/rpmdb.c | 16 ++++++++-------- lib/rpmts.c | 9 ++++----- lib/transaction.c | 18 +++++++++--------- 5 files changed, 28 insertions(+), 29 deletions(-) diff --git a/lib/depends.c b/lib/depends.c index 16df236..75b299b 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -116,7 +116,7 @@ static void addUpgradeErasures(rpmts ts, tsMembers tsmem, rpm_color_t tscolor, removePackage(ts, oh, p); } - mi = rpmdbFreeIterator(mi); + rpmdbFreeIterator(mi); } /* Add erase elements for obsoleted packages of same color (if any). */ @@ -154,12 +154,12 @@ static void addObsoleteErasures(rpmts ts, tsMembers tsmem, rpm_color_t tscolor, char * ohNEVRA = headerGetAsString(oh, RPMTAG_NEVRA); rpmlog(RPMLOG_DEBUG, " Obsoletes: %s\t\terases %s\n", rpmdsDNEVR(obsoletes)+2, ohNEVRA); - ohNEVRA = _free(ohNEVRA); + free(ohNEVRA); removePackage(ts, oh, p); } } - mi = rpmdbFreeIterator(mi); + rpmdbFreeIterator(mi); } } @@ -506,8 +506,8 @@ static void checkInstDeps(rpmts ts, depCache dcache, rpmte te, checkDS(ts, dcache, te, pkgNEVRA, ds, dep, 0); - ds = rpmdsFree(ds); - pkgNEVRA = _free(pkgNEVRA); + rpmdsFree(ds); + free(pkgNEVRA); } rpmdbFreeIterator(mi); } diff --git a/lib/order.c b/lib/order.c index 34ad795..28284d4 100644 --- a/lib/order.c +++ b/lib/order.c @@ -55,13 +55,13 @@ static void rpmTSIFree(tsortInfo tsi) while (tsi->tsi_relations != NULL) { rel = tsi->tsi_relations; tsi->tsi_relations = tsi->tsi_relations->rel_next; - rel = _free(rel); + free(rel); } while (tsi->tsi_forward_relations != NULL) { rel = tsi->tsi_forward_relations; tsi->tsi_forward_relations = \ tsi->tsi_forward_relations->rel_next; - rel = _free(rel); + free(rel); } } diff --git a/lib/rpmdb.c b/lib/rpmdb.c index 6511bda..5f5d9b4 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); } diff --git a/lib/rpmts.c b/lib/rpmts.c index 6982303..cf82ac7 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -88,9 +88,8 @@ int rpmtsOpenDB(rpmts ts, int dbmode) rc = rpmdbOpen(ts->rootDir, &ts->rdb, ts->dbmode, 0644); if (rc) { char * dn = rpmGetPath(ts->rootDir, "%{_dbpath}", NULL); - rpmlog(RPMLOG_ERR, - _("cannot open Packages database in %s\n"), dn); - dn = _free(dn); + rpmlog(RPMLOG_ERR, _("cannot open Packages database in %s\n"), dn); + free(dn); } return rc; } @@ -499,7 +498,7 @@ rpmps rpmtsProblems(rpmts ts) rpmpsMerge(ps, teprobs); rpmpsFree(teprobs); } - pi = rpmtsiFree(pi); + rpmtsiFree(pi); /* Return NULL on no problems instead of an empty set */ if (rpmpsNumProblems(ps) == 0) { @@ -515,7 +514,7 @@ void rpmtsCleanProblems(rpmts ts) rpmtsi pi = rpmtsiInit(ts); while ((p = rpmtsiNext(pi, 0)) != NULL) rpmteCleanProblems(p); - pi = rpmtsiFree(pi); + rpmtsiFree(pi); } void rpmtsClean(rpmts ts) diff --git a/lib/transaction.c b/lib/transaction.c index 2700ce6..3f1bc0f 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -310,7 +310,7 @@ static uint64_t countFiles(rpmts ts) rpmte p; while ((p = rpmtsiNext(pi, 0)) != NULL) fc += rpmfiFC(rpmteFI(p)); - pi = rpmtsiFree(pi); + rpmtsiFree(pi); return fc; } @@ -886,7 +886,7 @@ rpmdbMatchIterator rpmFindBaseNamesInDB(rpmts ts, uint64_t fileCount) rpmStringSetAddEntry(baseNames, baseName); } } - pi = rpmtsiFree(pi); + rpmtsiFree(pi); rpmStringSetFree(baseNames); rpmdbSortIterator(mi); @@ -1015,7 +1015,7 @@ void checkInstalledFiles(rpmts ts, uint64_t fileCount, rpmFpHash ht, fingerPrint h = newheader; } - mi = rpmdbFreeIterator(mi); + rpmdbFreeIterator(mi); } #define badArch(_a) (rpmMachineScore(RPM_MACHTABLE_INSTARCH, (_a)) == 0) @@ -1071,7 +1071,7 @@ static rpmps checkProblems(rpmts ts) mi = rpmdbFreeIterator(mi); } } - pi = rpmtsiFree(pi); + rpmtsiFree(pi); return rpmtsProblems(ts); } @@ -1088,7 +1088,7 @@ static int runTransScripts(rpmts ts, pkgGoal goal) while ((p = rpmtsiNext(pi, TR_ADDED)) != NULL) { rpmteProcess(p, goal); } - pi = rpmtsiFree(pi); + rpmtsiFree(pi); return 0; /* what to do about failures? */ } @@ -1357,8 +1357,8 @@ static int rpmtsPrepare(rpmts ts) pi = rpmtsiFree(pi); exit: - ht = rpmFpHashFree(ht); - fpc = fpCacheFree(fpc); + rpmFpHashFree(ht); + fpCacheFree(fpc); rpmtsFreeDSI(ts); return rc; } @@ -1386,7 +1386,7 @@ static int rpmtsProcess(rpmts ts) } (void) rpmdbSync(rpmtsGetRdb(ts)); } - pi = rpmtsiFree(pi); + rpmtsiFree(pi); return rc; } @@ -1461,7 +1461,7 @@ exit: /* Finish up... */ (void) umask(oldmask); (void) rpmtsFinish(ts); - tsprobs = rpmpsFree(tsprobs); + rpmpsFree(tsprobs); rpmlockFree(lock); return rc; } -- 2.7.4