RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Mar-2009 21:16:29
Branch: rpm-5_1 Handle: 2009032120162504
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/lib depends.c rpmgi.c rpmte.h rpmts.c rpmts.h
transaction.c
rpm/python rpmts-py.c
Log:
- rpmtsi: use __FUNCTION__ rather than adding a 2nd arg everywhere.
Summary:
Revision Changes Path
1.2288.2.229+1 -0 rpm/CHANGES
1.394.2.15 +19 -23 rpm/lib/depends.c
2.52.2.5 +2 -4 rpm/lib/rpmgi.c
2.47.2.5 +3 -4 rpm/lib/rpmte.h
2.145.2.7 +2 -4 rpm/lib/rpmts.c
2.98.2.6 +1 -1 rpm/lib/rpmts.h
1.371.2.5 +14 -16 rpm/lib/transaction.c
1.86.2.5 +1 -2 rpm/python/rpmts-py.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.228 -r1.2288.2.229 CHANGES
--- rpm/CHANGES 21 Mar 2009 17:33:37 -0000 1.2288.2.228
+++ rpm/CHANGES 21 Mar 2009 20:16:25 -0000 1.2288.2.229
@@ -1,4 +1,5 @@
5.1.7 -> 5.1.8:
+ - jbj: rpmtsi: use __FUNCTION__ rather than adding a 2nd arg everywhere.
- jbj: pgpDig: fix: rpmioFreePoolItem() can return non-NULL, clear
ts->dig.
- jbj: rpmio: add --pgpdebug for pgpDig debugging.
- jbj: yarn: wire up rpmtsiFini, eliminate rpmtsiFree.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.394.2.14 -r1.394.2.15 depends.c
--- rpm/lib/depends.c 21 Mar 2009 17:33:38 -0000 1.394.2.14
+++ rpm/lib/depends.c 21 Mar 2009 20:16:26 -0000 1.394.2.15
@@ -536,7 +536,6 @@
int rpmtsAddInstallElement(rpmts ts, Header h,
fnpyKey key, int upgrade, rpmRelocation relocs)
{
- static const char msg[] = "rpmtsAddInstallElement";
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmdepFlags depFlags = rpmtsDFlags(ts);
uint32_t tscolor = rpmtsColor(ts);
@@ -695,7 +694,7 @@
break;
}
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
oldChk = rpmdsFree(oldChk);
newChk = rpmdsFree(newChk);
@@ -789,7 +788,7 @@
exit:
arch = _free(arch);
os = _free(os);
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
return ec;
}
@@ -2057,7 +2056,6 @@
/*...@modifies ts, p, *selected, rpmGlobalMacroContext,
fileSystem, internalState @*/
{
- static const char msg[] = "addRelation";
rpmtsi qi; rpmte q;
tsortInfo tsi;
nsType NSType = rpmdsNSType(requires);
@@ -2116,7 +2114,7 @@
if (pkgKey == rpmteAddedKey(q))
break;
}
- qi = rpmtsiFree(qi, msg);
+ qi = rpmtsiFree(qi);
if (q == NULL || i >= ts->orderCount)
return 0;
@@ -2243,7 +2241,6 @@
int rpmtsOrder(rpmts ts)
{
- static const char msg[] = "rpmtsOrder";
rpmds requires;
uint32_t Flags;
int anaconda = rpmtsDFlags(ts) & RPMDEPS_FLAG_ANACONDA;
@@ -2295,7 +2292,7 @@
pkgKey = (alKey)(((long)pkgKey) + ts->numAddedPackages);
(void) rpmteSetAddedKey(p, pkgKey);
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
rpmalMakeIndex(ts->erasedPackages);
(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_ORDER), 0);
@@ -2317,7 +2314,7 @@
pi = rpmtsiInit(ts);
while ((p = rpmtsiNext(pi, oType)) != NULL)
rpmteNewTSI(p);
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
/* Record all relations. */
rpmlog(RPMLOG_DEBUG, D_("========== recording tsort relations\n"));
@@ -2403,7 +2400,7 @@
p->type = TR_REMOVED;
}
}
- qi = rpmtsiFree(qi, msg);
+ qi = rpmtsiFree(qi);
}
if (_autobits != 0xffffffff)
@@ -2431,7 +2428,7 @@
}
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
/* Save predecessor count and mark tree roots. */
treex = 0;
@@ -2455,14 +2452,14 @@
#endif
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
ts->ntrees = treex;
/* T4. Scan for zeroes. */
rpmlog(RPMLOG_DEBUG, D_("========== tsorting packages (order,
#predecessors, #succesors, tree, Ldepth, Rbreadth)\n"));
rescan:
- if (pi != NULL) pi = rpmtsiFree(pi, msg);
+ if (pi != NULL) pi = rpmtsiFree(pi);
q = r = NULL;
qlen = 0;
pi = rpmtsiInit(ts);
@@ -2478,7 +2475,7 @@
addQ(p, &q, &r, prefcolor);
qlen++;
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
/* T5. Output front of queue (T7. Remove from queue.) */
for (; q != NULL; q = rpmteTSI(q)->tsi_suc) {
@@ -2562,7 +2559,7 @@
tsi->tsi_suc = p;
tsi = rpmteTSI(p);
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
tsi->tsi_suc = NULL;
}
}
@@ -2581,7 +2578,7 @@
if (rpmteTSI(q)->tsi_count == 0)
rpmteTSI(q)->tsi_count = -1;
}
- qi = rpmtsiFree(qi, msg);
+ qi = rpmtsiFree(qi);
/* T10. Mark all packages with their predecessors. */
qi = rpmtsiInit(ts);
@@ -2592,7 +2589,7 @@
markLoop(tsi, q);
rpmteTSI(q)->tsi_next = tsi;
}
- qi = rpmtsiFree(qi, msg);
+ qi = rpmtsiFree(qi);
/* T11. Print all dependency loops. */
ri = rpmtsiInit(ts);
@@ -2651,7 +2648,7 @@
rpmteTSI(p)->tsi_queued = 0;
}
}
- ri = rpmtsiFree(ri, msg);
+ ri = rpmtsiFree(ri);
/* If a relation was eliminated, then continue sorting. */
/* XXX TODO: add control bit. */
@@ -2676,7 +2673,7 @@
pi = rpmtsiInit(ts);
while ((p = rpmtsiNext(pi, 0)) != NULL)
rpmteFreeTSI(p);
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
/*
* The order ends up as installed packages followed by removed packages.
@@ -2690,7 +2687,7 @@
orderList[j].orIndex = rpmtsiOc(pi);
j++;
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
qsort(orderList, numOrderList, sizeof(*orderList), orderListIndexCmp);
@@ -2737,7 +2734,6 @@
int rpmtsCheck(rpmts ts)
{
- static const char msg[] = "rpmtsCheck";
const char * depName = NULL;
rpmdepFlags depFlags = rpmtsDFlags(ts);
uint32_t tscolor = rpmtsColor(ts);
@@ -2834,7 +2830,7 @@
if (rc && (ourrc = rc) >= terminate)
break;
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
if (rc && (ourrc = rc) >= terminate)
goto exit;
@@ -2877,7 +2873,7 @@
if (rc && (ourrc = rc) >= terminate)
break;
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
if (rc && (ourrc = rc) >= terminate)
goto exit;
@@ -2899,7 +2895,7 @@
exit:
mi = rpmdbFreeIterator(mi);
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
depName = _free(depName);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_CHECK), 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.52.2.4 -r2.52.2.5 rpmgi.c
--- rpm/lib/rpmgi.c 21 Mar 2009 17:33:38 -0000 2.52.2.4
+++ rpm/lib/rpmgi.c 21 Mar 2009 20:16:26 -0000 2.52.2.5
@@ -464,7 +464,6 @@
rpmgi rpmgiFree(rpmgi gi)
{
- static const char msg[] = "rpmgiFree";
int xx;
if (gi == NULL) return NULL;
@@ -487,7 +486,7 @@
xx = Fclose(gi->fd);
gi->fd = NULL;
}
- gi->tsi = rpmtsiFree(gi->tsi, msg);
+ gi->tsi = rpmtsiFree(gi->tsi);
gi->mi = rpmdbFreeIterator(gi->mi);
gi->ts = rpmtsFree(gi->ts);
@@ -539,7 +538,6 @@
rpmRC rpmgiNext(/*...@null@*/ rpmgi gi)
{
- static const char msg[] = "rpmgiNext";
char hnum[32];
rpmRC rpmrc = RPMRC_NOTFOUND;
int xx;
@@ -640,7 +638,7 @@
}
}
if (rpmrc != RPMRC_OK) {
- gi->tsi = rpmtsiFree(gi->tsi, msg);
+ gi->tsi = rpmtsiFree(gi->tsi);
goto enditer;
}
} break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.h
============================================================================
$ cvs diff -u -r2.47.2.4 -r2.47.2.5 rpmte.h
--- rpm/lib/rpmte.h 21 Mar 2009 17:33:38 -0000 2.47.2.4
+++ rpm/lib/rpmte.h 21 Mar 2009 20:16:26 -0000 2.47.2.5
@@ -638,12 +638,11 @@
* @return NULL always
*/
/*...@unused@*/ /*...@null@*/
-rpmtsi rpmtsiFree(/*...@killref@*//*...@null@*/ rpmtsi tsi,
- /*...@null@*/ const char * msg)
+rpmtsi rpmtsiFree(/*...@killref@*//*...@null@*/ rpmtsi tsi)
/*...@globals fileSystem @*/
/*...@modifies fileSystem @*/;
-#define rpmtsiFree(_tsi, _msg) \
- ((rpmtsi)rpmioFreePoolItem((rpmioItem)(_tsi), _msg, __FILE__, __LINE__))
+#define rpmtsiFree(_tsi) \
+ ((rpmtsi)rpmioFreePoolItem((rpmioItem)(_tsi), __FUNCTION__, __FILE__,
__LINE__))
/** \ingroup rpmte
* Create transaction element iterator.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.145.2.6 -r2.145.2.7 rpmts.c
--- rpm/lib/rpmts.c 21 Mar 2009 17:33:38 -0000 2.145.2.6
+++ rpm/lib/rpmts.c 21 Mar 2009 20:16:26 -0000 2.145.2.7
@@ -519,7 +519,6 @@
void rpmtsClean(rpmts ts)
{
- static const char msg[] = "rpmtsClean";
rpmtsi pi; rpmte p;
if (ts == NULL)
@@ -529,7 +528,7 @@
pi = rpmtsiInit(ts);
while ((p = rpmtsiNext(pi, 0)) != NULL)
rpmteCleanDS(p);
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
ts->addedPackages = rpmalFree(ts->addedPackages);
ts->numAddedPackages = 0;
@@ -547,7 +546,6 @@
void rpmtsEmpty(rpmts ts)
{
- static const char msg[] = "rpmtsEmpty";
rpmtsi pi; rpmte p;
int oc;
@@ -563,7 +561,7 @@
ts->order[oc] = rpmteFree(ts->order[oc]);
/*...@=type =unqualifiedtrans @*/
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
ts->orderCount = 0;
ts->ntrees = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.h
============================================================================
$ cvs diff -u -r2.98.2.5 -r2.98.2.6 rpmts.h
--- rpm/lib/rpmts.h 21 Mar 2009 17:33:38 -0000 2.98.2.5
+++ rpm/lib/rpmts.h 21 Mar 2009 20:16:27 -0000 2.98.2.6
@@ -1088,7 +1088,7 @@
while ((te = rpmtsiNext(tsi, 0)) != NULL)
fprintf(fp, "t%s> %s\n", (rpmteType(te) == TR_ADDED ? "I" : "E"),
rpmteNEVRA(te));
- tsi = rpmtsiFree(tsi, "rpmtsPrint");
+ tsi = rpmtsiFree(tsi);
return 0;
}
#endif /* defined(_RPMTS_PRINT) */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.371.2.4 -r1.371.2.5 transaction.c
--- rpm/lib/transaction.c 21 Mar 2009 17:33:38 -0000 1.371.2.4
+++ rpm/lib/transaction.c 21 Mar 2009 20:16:27 -0000 1.371.2.5
@@ -939,7 +939,6 @@
/*...@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState
@*/
/*...@modifies rbts, rpmGlobalMacroContext, fileSystem, internalState
@*/
{
- static const char msg[] = "rpmtsRollback";
const char * semfn = NULL;
rpmRC rc = 0;
uint32_t arbgoal = rpmtsARBGoal(rbts);
@@ -984,7 +983,7 @@
break;
}
}
- tsi = rpmtsiFree(tsi, msg);
+ tsi = rpmtsiFree(tsi);
if (rc != RPMRC_OK)
goto cleanup;
}
@@ -1087,7 +1086,6 @@
/*...@globals fileSystem @*/
/*...@modifies ts, p, fileSystem @*/
{
- static const char msg[] = "markLinkedFailed";
rpmtsi qi; rpmte q;
int bingo;
@@ -1114,7 +1112,7 @@
q->linkFailed = p->linkFailed;
}
- qi = rpmtsiFree(qi, msg);
+ qi = rpmtsiFree(qi);
return 0;
}
@@ -1204,7 +1202,7 @@
dbmode = (O_RDWR|O_CREAT);
break;
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
}
/* Open database RDWR for installing packages. */
@@ -1289,7 +1287,7 @@
totalFileCount += fc;
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
ps = rpmpsFree(ps);
/* The ordering doesn't matter here */
@@ -1304,7 +1302,7 @@
totalFileCount += fc;
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
/* Run pre-transaction scripts, but only if there are no known
@@ -1376,7 +1374,7 @@
p->h = headerFree(p->h);
}
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
}
/* ===============================================
@@ -1416,7 +1414,7 @@
fi->fps = (fc > 0 ? xmalloc(fc * sizeof(*fi->fps)) : NULL);
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
if (!rpmtsChrootDone(ts)) {
const char * rootDir = rpmtsRootDir(ts);
@@ -1467,7 +1465,7 @@
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_FINGERPRINT), fc);
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
NOTIFY(ts, (NULL, RPMCALLBACK_TRANS_START, 6, ts->orderCount,
NULL, ts->notifyData));
@@ -1551,7 +1549,7 @@
if (rpmteDBOffset(q) == ro)
knownBad = ro;
}
- qi = rpmtsiFree(qi, msg);
+ qi = rpmtsiFree(qi);
shared->pkgFileNum = i;
shared->otherPkg = dbiIndexRecordOffset(matches[i], j);
@@ -1623,7 +1621,7 @@
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_FINGERPRINT), fc);
}
/*...@=nullpass@*/
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
ps = rpmpsFree(ps);
if (rpmtsChrootDone(ts)) {
@@ -1653,7 +1651,7 @@
continue;
fi->fps = _free(fi->fps);
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
fpc = fpCacheFree(fpc);
ts->ht = htFree(ts->ht);
@@ -1718,7 +1716,7 @@
/*...@switchbreak@*/ break;
}
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
if (progress) {
NOTIFY(ts, (NULL, RPMCALLBACK_REPACKAGE_STOP, 7, numRemoved,
NULL, ts->notifyData));
@@ -1898,7 +1896,7 @@
}
}
/*...@=nullpass@*/
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)) {
rpmlog(RPMLOG_DEBUG, D_("running post-transaction scripts\n"));
@@ -1966,7 +1964,7 @@
}
/*...@=nullpass@*/
}
- pi = rpmtsiFree(pi, msg);
+ pi = rpmtsiFree(pi);
}
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOCONTEXTS))
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmts-py.c
============================================================================
$ cvs diff -u -r1.86.2.4 -r1.86.2.5 rpmts-py.c
--- rpm/python/rpmts-py.c 21 Mar 2009 17:33:39 -0000 1.86.2.4
+++ rpm/python/rpmts-py.c 21 Mar 2009 20:16:29 -0000 1.86.2.5
@@ -331,7 +331,6 @@
rpmts_iternext(rpmtsObject * s)
/*...@modifies s @*/
{
- static const char msg[] = "rpmts_iternext";
PyObject * result = NULL;
rpmte te;
@@ -351,7 +350,7 @@
if (te != NULL) {
result = (PyObject *) rpmte_Wrap(te);
} else {
- s->tsi = rpmtsiFree(s->tsi, msg);
+ s->tsi = rpmtsiFree(s->tsi);
s->tsiFilter = 0;
}
/*...@=branchstate@*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
