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: 08-Dec-2009 14:25:05
Branch: HEAD Handle: 2009120813250500
Modified files:
rpm/lib rpminstall.c
Log:
- use hdrNum consistently for primary key.
Summary:
Revision Changes Path
1.221 +4 -5 rpm/lib/rpminstall.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.220 -r1.221 rpminstall.c
--- rpm/lib/rpminstall.c 15 May 2009 13:40:58 -0000 1.220
+++ rpm/lib/rpminstall.c 8 Dec 2009 13:25:05 -0000 1.221
@@ -715,7 +715,6 @@
int rpmErase(rpmts ts, QVA_t ia, const char ** argv)
{
- int count;
const char ** arg;
int numFailed = 0;
int numRPMS = 0;
@@ -769,9 +768,9 @@
numFailed++;
} else {
Header h; /* XXX iterator owns the reference */
- count = 0;
+ int count = 0;
while ((h = rpmmiNext(mi)) != NULL) {
- unsigned int recOffset = rpmmiInstance(mi);
+ uint32_t hdrNum = rpmmiInstance(mi);
if (!(count++ == 0 || (ia->installInterfaceFlags &
INSTALL_ALLMATCHES))) {
rpmlog(RPMLOG_ERR, _("\"%s\" specifies multiple
packages\n"),
@@ -779,8 +778,8 @@
numFailed++;
/*...@innerbreak@*/ break;
}
- if (recOffset) {
- (void) rpmtsAddEraseElement(ts, h, recOffset);
+ if (hdrNum) {
+ (void) rpmtsAddEraseElement(ts, h, hdrNum);
numRPMS++;
}
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
