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: 15-May-2009 15:41:00
Branch: HEAD Handle: 2009051513405802
Modified files:
rpm CHANGES
rpm/js rpmmi-js.c rpmts-js.c
rpm/lib depends.c psm.c rpmgi.c rpminstall.c rpmrollback.c
rpmts.c tgi.c transaction.c
rpm/python rpmmi-py.c rpmts-py.c
rpm/rpmdb hdrfmt.c librpmdb.vers pkgio.c rpmdb.c rpmdb.h
rpm/ruby rpmmi-rb.c
rpm/tools rpmcache.c
Log:
- rpmmi: rename the other methods for the match iterator object.
Summary:
Revision Changes Path
1.2989 +1 -0 rpm/CHANGES
1.20 +3 -3 rpm/js/rpmmi-js.c
1.23 +1 -1 rpm/js/rpmts-js.c
1.445 +8 -9 rpm/lib/depends.c
2.369 +16 -17 rpm/lib/psm.c
2.68 +3 -3 rpm/lib/rpmgi.c
1.220 +3 -3 rpm/lib/rpminstall.c
1.44 +2 -2 rpm/lib/rpmrollback.c
2.170 +2 -2 rpm/lib/rpmts.c
2.26 +1 -1 rpm/lib/tgi.c
1.403 +6 -6 rpm/lib/transaction.c
1.25 +3 -3 rpm/python/rpmmi-py.c
1.104 +3 -3 rpm/python/rpmts-py.c
1.138 +4 -4 rpm/rpmdb/hdrfmt.c
1.65 +14 -14 rpm/rpmdb/librpmdb.vers
1.99 +2 -2 rpm/rpmdb/pkgio.c
1.297 +17 -18 rpm/rpmdb/rpmdb.c
1.89 +9 -9 rpm/rpmdb/rpmdb.h
1.7 +3 -3 rpm/ruby/rpmmi-rb.c
2.40 +1 -1 rpm/tools/rpmcache.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2988 -r1.2989 CHANGES
--- rpm/CHANGES 15 May 2009 12:28:44 -0000 1.2988
+++ rpm/CHANGES 15 May 2009 13:40:58 -0000 1.2989
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+ - jbj: rpmmi: rename the other methods for the match iterator object.
- proyvind: make it possible to set macro files to load predefines from
by
defining PREMACROFILES at build time.
- jbj: rpmmi: rename the typedef and rpmmi{Init,Next,Free} methods.
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmi-js.c
============================================================================
$ cvs diff -u -r1.19 -r1.20 rpmmi-js.c
--- rpm/js/rpmmi-js.c 14 May 2009 16:58:23 -0000 1.19
+++ rpm/js/rpmmi-js.c 15 May 2009 13:40:58 -0000 1.20
@@ -40,7 +40,7 @@
if (!(ok = JS_ConvertArguments(cx, argc, argv, "is", &tag, &pattern)))
goto exit;
- rpmdbSetIteratorRE(mi, tag, type, pattern);
+ rpmmiAddPattern(mi, tag, type, pattern);
ok = JS_TRUE;
*rval = BOOLEAN_TO_JSVAL(ok);
@@ -89,10 +89,10 @@
break;
case _LENGTH:
case _COUNT: /* XXX is _LENGTH enuf? */
- *vp = INT_TO_JSVAL(rpmdbGetIteratorCount(mi));
+ *vp = INT_TO_JSVAL(rpmmiCount(mi));
break;
case _INSTANCE:
- *vp = INT_TO_JSVAL(rpmdbGetIteratorOffset(mi));
+ *vp = INT_TO_JSVAL(rpmmiInstance(mi));
break;
default:
{ JSObject *o = (JSVAL_IS_OBJECT(id) ? JSVAL_TO_OBJECT(id) :
NULL);
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmts-js.c
============================================================================
$ cvs diff -u -r1.22 -r1.23 rpmts-js.c
--- rpm/js/rpmts-js.c 14 May 2009 16:58:23 -0000 1.22
+++ rpm/js/rpmts-js.c 15 May 2009 13:40:58 -0000 1.23
@@ -108,7 +108,7 @@
while ((h = rpmmiNext(mi)) != NULL) {
xx = (upgrade >= 0)
? rpmtsAddInstallElement(ts, h, (fnpyKey)pkgN, upgrade, NULL)
- : rpmtsAddEraseElement(ts, h, rpmdbGetIteratorOffset(mi));
+ : rpmtsAddEraseElement(ts, h, rpmmiInstance(mi));
break;
}
mi = rpmmiFree(mi);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.444 -r1.445 depends.c
--- rpm/lib/depends.c 14 May 2009 16:58:24 -0000 1.444
+++ rpm/lib/depends.c 15 May 2009 13:40:58 -0000 1.445
@@ -285,7 +285,7 @@
/* Create an erasure element. */
lastx = -1;
- xx = removePackage(ts, oh, rpmdbGetIteratorOffset(mi), &lastx, pkgKey);
+ xx = removePackage(ts, oh, rpmmiInstance(mi), &lastx, pkgKey);
assert(lastx >= 0 && lastx < ts->orderCount);
q = ts->order[lastx];
@@ -357,7 +357,7 @@
/* Count remaining members in build set, excluding -debuginfo (if any).
*/
mi = rpmtsInitIterator(ts, _debuginfo_tag, keyval, keylen);
- xx = rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages,
1);
+ xx = rpmmiPrune(mi, ts->removedPackages, ts->numRemovedPackages, 1);
while((oh = rpmmiNext(mi)) != NULL) {
/* Skip identical packages. */
if (rpmHeadersIdentical(h, oh))
@@ -369,7 +369,7 @@
continue;
/* Save the -debuginfo member. */
if (chkSuffix(he->p.str, "-debuginfo")) {
- debuginfoInstance = rpmdbGetIteratorOffset(mi);
+ debuginfoInstance = rpmmiInstance(mi);
debuginfoHeader = headerLink(oh);
} else
nrefs++;
@@ -462,8 +462,7 @@
else
mi = rpmtsInitIterator(ts, _obsolete_tag, Name, 0);
- xx = rpmdbPruneIterator(mi,
- ts->removedPackages, ts->numRemovedPackages, 1);
+ xx = rpmmiPrune(mi, ts->removedPackages, ts->numRemovedPackages, 1);
while((oh = rpmmiNext(mi)) != NULL) {
int lastx;
@@ -487,7 +486,7 @@
/* Create an erasure element. */
lastx = -1;
- xx = removePackage(ts, oh, rpmdbGetIteratorOffset(mi), &lastx,
pkgKey);
+ xx = removePackage(ts, oh, rpmmiInstance(mi), &lastx, pkgKey);
assert(lastx >= 0 && lastx < ts->orderCount);
q = ts->order[lastx];
@@ -1430,7 +1429,7 @@
/* depFlags better be 0! */
mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, Name, 0);
- (void) rpmdbPruneIterator(mi,
+ (void) rpmmiPrune(mi,
ts->removedPackages, ts->numRemovedPackages, 1);
while ((h = rpmmiNext(mi)) != NULL) {
rpmdsNotify(dep, _("(db files)"), rc);
@@ -1441,7 +1440,7 @@
}
mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, Name, 0);
- (void) rpmdbPruneIterator(mi,
+ (void) rpmmiPrune(mi,
ts->removedPackages, ts->numRemovedPackages, 1);
while ((h = rpmmiNext(mi)) != NULL) {
if (rpmdsAnyMatchesDep(h, dep, _rpmds_nopromote)) {
@@ -1754,7 +1753,7 @@
int terminate = 2; /* XXX terminate if rc >= terminate */
int ourrc = 0;
- (void) rpmdbPruneIterator(mi,
+ (void) rpmmiPrune(mi,
ts->removedPackages, ts->numRemovedPackages, 1);
while (ourrc < terminate && (h = rpmmiNext(mi)) != NULL) {
rpmds requires = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.368 -r2.369 psm.c
--- rpm/lib/psm.c 14 May 2009 20:13:32 -0000 2.368
+++ rpm/lib/psm.c 15 May 2009 13:40:58 -0000 2.369
@@ -115,8 +115,8 @@
}
mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0);
- xx = rpmdbAppendIterator(mi, offsets, num);
- xx = rpmdbSetIteratorRewrite(mi, 1);
+ xx = rpmmiGrow(mi, offsets, num);
+ xx = rpmmiSetRewrite(mi, 1);
sfi = replaced;
while ((h = rpmmiNext(mi)) != NULL) {
@@ -130,7 +130,7 @@
if (!xx)
continue;
- prev = rpmdbGetIteratorOffset(mi);
+ prev = rpmmiInstance(mi);
num = 0;
while (sfi->otherPkg && sfi->otherPkg == prev) {
assert(sfi->otherFileNum < he->c);
@@ -139,7 +139,7 @@
if (modified == 0) {
/* Modified header will be rewritten. */
modified = 1;
- xx = rpmdbSetIteratorModified(mi, modified);
+ xx = rpmmiSetModified(mi, modified);
}
num++;
}
@@ -1416,11 +1416,11 @@
nvals = argiCount(instances);
vals = argiData(instances);
if (nvals > 0)
- xx = rpmdbPruneIterator(mi, (int *)vals, nvals, 1);
+ xx = rpmmiPrune(mi, (int *)vals, nvals, 1);
prev = 0;
while((triggeredH = rpmmiNext(mi)) != NULL) {
- instance = rpmdbGetIteratorOffset(mi);
+ instance = rpmmiInstance(mi);
if (prev == instance)
/*...@innercontinue@*/ continue;
rc |= handleOneTrigger(psm, fi->h, triggeredH, arg2);
@@ -1602,18 +1602,17 @@
nvals = argiCount(instances);
vals = argiData(instances);
if (nvals > 0)
- xx = rpmdbPruneIterator(mi, (int *)vals, nvals, 1);
+ xx = rpmmiPrune(mi, (int *)vals, nvals, 1);
prev = 0;
while((sourceH = rpmmiNext(mi)) != NULL) {
/* Skip headers that have already been processed. */
- instance = rpmdbGetIteratorOffset(mi);
+ instance = rpmmiInstance(mi);
if (prev == instance)
/*...@innercontinue@*/ continue;
- rc |= handleOneTrigger(psm, sourceH, fi->h,
- rpmdbGetIteratorCount(mi));
+ rc |= handleOneTrigger(psm, sourceH, fi->h, rpmmiCount(mi));
/* Mark header instance as processed. */
prev = instance;
@@ -2135,26 +2134,26 @@
psm->mi = rpmtsInitIterator(ts, RPMTAG_SHA1HEADER, hdrid, 0);
} else {
psm->mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(psm->te),0);
- xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_EPOCH, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(psm->mi, RPMTAG_EPOCH, RPMMIRE_STRCMP,
rpmteE(psm->te));
- xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_VERSION, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(psm->mi, RPMTAG_VERSION, RPMMIRE_STRCMP,
rpmteV(psm->te));
- xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_RELEASE, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(psm->mi, RPMTAG_RELEASE, RPMMIRE_STRCMP,
rpmteR(psm->te));
#ifdef RPM_VENDOR_MANDRIVA
- xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_DISTEPOCH,
RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(psm->mi, RPMTAG_DISTEPOCH, RPMMIRE_STRCMP,
rpmteD(psm->te));
#endif
if (tscolor) {
- xx = rpmdbSetIteratorRE(psm->mi,RPMTAG_ARCH, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(psm->mi,RPMTAG_ARCH, RPMMIRE_STRCMP,
rpmteA(psm->te));
- xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_OS, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(psm->mi, RPMTAG_OS, RPMMIRE_STRCMP,
rpmteO(psm->te));
}
}
while ((psm->oh = rpmmiNext(psm->mi)) != NULL) {
- fi->record = rpmdbGetIteratorOffset(psm->mi);
+ fi->record = rpmmiInstance(psm->mi);
psm->oh = NULL;
/*...@loopbreak@*/ break;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.67 -r2.68 rpmgi.c
--- rpm/lib/rpmgi.c 14 May 2009 16:58:24 -0000 2.67
+++ rpm/lib/rpmgi.c 15 May 2009 13:40:58 -0000 2.68
@@ -439,7 +439,7 @@
if (!res) {
if (_rpmgi_debug < 0)
fprintf(stderr, "\tav %p[%d]: \"%s\" -> %s ~= \"%s\"\n", gi->argv, (int)(av
- gi->argv), *av, tagName(tag), pat);
- res = rpmdbSetIteratorRE(gi->mi, tag, RPMMIRE_DEFAULT, pat);
+ res = rpmmiAddPattern(gi->mi, tag, RPMMIRE_DEFAULT, pat);
}
a = _free(a);
}
@@ -583,7 +583,7 @@
if (h != NULL) {
if (!(gi->flags & RPMGI_NOHEADER))
gi->h = headerLink(h);
- sprintf(hnum, "%u", rpmdbGetIteratorOffset(gi->mi));
+ sprintf(hnum, "%u", rpmmiInstance(gi->mi));
gi->hdrPath = rpmExpand("rpmdb h# ", hnum, NULL);
rpmrc = RPMRC_OK;
/* XXX header reference held by iterator, so no headerFree */
@@ -609,7 +609,7 @@
if (h != NULL) {
if (!(gi->flags & RPMGI_NOHEADER))
gi->h = headerLink(h);
- sprintf(hnum, "%u", rpmdbGetIteratorOffset(gi->mi));
+ sprintf(hnum, "%u", rpmmiInstance(gi->mi));
gi->hdrPath = rpmExpand("rpmdb h# ", hnum, NULL);
rpmrc = RPMRC_OK;
/* XXX header reference held by iterator, so no headerFree */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.219 -r1.220 rpminstall.c
--- rpm/lib/rpminstall.c 14 May 2009 16:58:24 -0000 1.219
+++ rpm/lib/rpminstall.c 15 May 2009 13:40:58 -0000 1.220
@@ -343,7 +343,7 @@
return RPMRC_NOTFOUND;
while ((h = rpmmiNext(mi)) != NULL) {
- unsigned int recOffset = rpmdbGetIteratorOffset(mi);
+ unsigned int recOffset = rpmmiInstance(mi);
if (recOffset == 0) { /* XXX can't happen. */
rc = RPMRC_FAIL;
@@ -643,7 +643,7 @@
assert(xx != 0 && he->p.str != NULL);
mi = rpmtsInitIterator(ts, RPMTAG_NAME, he->p.str, 0);
he->p.ptr = _free(he->p.ptr);
- count = rpmdbGetIteratorCount(mi);
+ count = rpmmiCount(mi);
while ((oldH = rpmmiNext(mi)) != NULL) {
if (rpmVersionCompare(oldH, h) < 0)
/*...@innercontinue@*/ continue;
@@ -771,7 +771,7 @@
Header h; /* XXX iterator owns the reference */
count = 0;
while ((h = rpmmiNext(mi)) != NULL) {
- unsigned int recOffset = rpmdbGetIteratorOffset(mi);
+ unsigned int recOffset = rpmmiInstance(mi);
if (!(count++ == 0 || (ia->installInterfaceFlags &
INSTALL_ALLMATCHES))) {
rpmlog(RPMLOG_ERR, _("\"%s\" specifies multiple
packages\n"),
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrollback.c
============================================================================
$ cvs diff -u -r1.43 -r1.44 rpmrollback.c
--- rpm/lib/rpmrollback.c 14 May 2009 16:58:24 -0000 1.43
+++ rpm/lib/rpmrollback.c 15 May 2009 13:40:58 -0000 1.44
@@ -108,7 +108,7 @@
mi = rpmtsInitIterator(ts, tag, NULL, 0);
#ifdef NOTYET
- (void) rpmdbSetIteratorRE(mi, RPMTAG_NAME, RPMMIRE_DEFAULT,
'!gpg-pubkey');
+ (void) rpmmiAddPattern(mi, RPMTAG_NAME, RPMMIRE_DEFAULT, '!gpg-pubkey');
#endif
while ((h = rpmmiNext(mi)) != NULL) {
he->tag = tag;
@@ -136,7 +136,7 @@
idt->done = 0;
idt->h = headerLink(h);
idt->key = NULL;
- idt->instance = rpmdbGetIteratorOffset(mi);
+ idt->instance = rpmmiInstance(mi);
idt->val.u32 = tid;
}
idtx->nidt++;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.169 -r2.170 rpmts.c
--- rpm/lib/rpmts.c 14 May 2009 16:58:24 -0000 2.169
+++ rpm/lib/rpmts.c 15 May 2009 13:40:58 -0000 2.170
@@ -230,11 +230,11 @@
/* Verify header signature/digest during retrieve (if not disabled). */
if (mi && !(rpmtsVSFlags(ts) & RPMVSF_NOHDRCHK))
- (void) rpmdbSetHdrChk(mi, ts);
+ (void) rpmmiSetHdrChk(mi, ts);
/* Select specified arch only. */
if (arch != NULL)
- xx = rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_DEFAULT, arch);
+ xx = rpmmiAddPattern(mi, RPMTAG_ARCH, RPMMIRE_DEFAULT, arch);
return mi;
}
/*...@=compdef@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/tgi.c
============================================================================
$ cvs diff -u -r2.25 -r2.26 tgi.c
--- rpm/lib/tgi.c 14 May 2009 16:58:24 -0000 2.25
+++ rpm/lib/tgi.c 15 May 2009 13:40:58 -0000 2.26
@@ -59,7 +59,7 @@
return RPMRC_NOTFOUND;
while ((h = rpmmiNext(mi)) != NULL) {
- unsigned int recOffset = rpmdbGetIteratorOffset(mi);
+ unsigned int recOffset = rpmmiInstance(mi);
if (recOffset == 0) { /* XXX can't happen. */
rc = RPMRC_FAIL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.402 -r1.403 transaction.c
--- rpm/lib/transaction.c 14 May 2009 16:58:24 -0000 1.402
+++ rpm/lib/transaction.c 15 May 2009 13:40:58 -0000 1.403
@@ -1281,20 +1281,20 @@
if (!(rpmtsFilterFlags(ts) & RPMPROB_FILTER_REPLACEPKG)) {
mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(p), 0);
- xx = rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP,
rpmteE(p));
- xx = rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(mi, RPMTAG_VERSION, RPMMIRE_STRCMP,
rpmteV(p));
- xx = rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP,
rpmteR(p));
#ifdef RPM_VENDOR_MANDRIVA
- xx = rpmdbSetIteratorRE(mi, RPMTAG_DISTEPOCH, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(mi, RPMTAG_DISTEPOCH, RPMMIRE_STRCMP,
rpmteD(p));
#endif
if (tscolor) {
- xx = rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(mi, RPMTAG_ARCH, RPMMIRE_STRCMP,
rpmteA(p));
- xx = rpmdbSetIteratorRE(mi, RPMTAG_OS, RPMMIRE_STRCMP,
+ xx = rpmmiAddPattern(mi, RPMTAG_OS, RPMMIRE_STRCMP,
rpmteO(p));
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmmi-py.c
============================================================================
$ cvs diff -u -r1.24 -r1.25 rpmmi-py.c
--- rpm/python/rpmmi-py.c 14 May 2009 16:58:25 -0000 1.24
+++ rpm/python/rpmmi-py.c 15 May 2009 13:40:59 -0000 1.25
@@ -125,7 +125,7 @@
int rc = 0;
if (s->mi != NULL)
- rc = rpmdbGetIteratorOffset(s->mi);
+ rc = rpmmiInstance(s->mi);
return Py_BuildValue("i", rc);
}
@@ -140,7 +140,7 @@
int rc = 0;
if (s->mi != NULL)
- rc = rpmdbGetIteratorCount(s->mi);
+ rc = rpmmiCount(s->mi);
return Py_BuildValue("i", rc);
}
@@ -168,7 +168,7 @@
return NULL;
}
- rpmdbSetIteratorRE(s->mi, tag, type, pattern);
+ rpmmiAddPattern(s->mi, tag, type, pattern);
Py_INCREF (Py_None);
return Py_None;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmts-py.c
============================================================================
$ cvs diff -u -r1.103 -r1.104 rpmts-py.c
--- rpm/python/rpmts-py.c 14 May 2009 16:58:25 -0000 1.103
+++ rpm/python/rpmts-py.c 15 May 2009 13:40:59 -0000 1.104
@@ -473,7 +473,7 @@
char * name = PyString_AsString(o);
mi = rpmtsInitIterator(s->ts, RPMDBI_LABEL, name, 0);
- count = rpmdbGetIteratorCount(mi);
+ count = rpmmiCount(mi);
if (count <= 0) {
mi = rpmmiFree(mi);
PyErr_SetString(pyrpmError, "package not installed");
@@ -481,7 +481,7 @@
} else { /* XXX: Note that we automatically choose to remove all
matches */
Header h;
while ((h = rpmmiNext(mi)) != NULL) {
- unsigned int recOffset = rpmdbGetIteratorOffset(mi);
+ unsigned int recOffset = rpmmiInstance(mi);
if (recOffset)
rpmtsAddEraseElement(s->ts, h, recOffset);
}
@@ -499,7 +499,7 @@
} else {
Header h;
while ((h = rpmmiNext(mi)) != NULL) {
- uint32_t recOffset = rpmdbGetIteratorOffset(mi);
+ uint32_t recOffset = rpmmiInstance(mi);
if (recOffset)
rpmtsAddEraseElement(s->ts, h, recOffset);
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
============================================================================
$ cvs diff -u -r1.137 -r1.138 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c 14 May 2009 16:58:25 -0000 1.137
+++ rpm/rpmdb/hdrfmt.c 15 May 2009 13:40:59 -0000 1.138
@@ -2694,7 +2694,7 @@
mi = rpmmiInit(_rpmdb, tagN, key, keylen);
if (hitp && *hitp)
- xx = rpmdbPruneIterator(mi, (int *)argiData(*hitp), argiCount(*hitp),
0);
+ xx = rpmmiPrune(mi, (int *)argiData(*hitp), argiCount(*hitp), 0);
while ((oh = rpmmiNext(mi)) != NULL) {
if (!headerGet(oh, RNhe, 0))
goto bottom;
@@ -2734,7 +2734,7 @@
xx = argvAdd(avp, NVRAhe->p.str);
xx = argvSort(*avp, NULL);
if (hitp != NULL)
- xx = argiAdd(hitp, -1, rpmdbGetIteratorOffset(mi));
+ xx = argiAdd(hitp, -1, rpmmiInstance(mi));
rc++;
}
@@ -2871,7 +2871,7 @@
mi = rpmmiInit(_rpmdb, tagN, key, keylen);
if (hitp && *hitp)
- xx = rpmdbPruneIterator(mi, (int *)argiData(*hitp), argiCount(*hitp),
0);
+ xx = rpmmiPrune(mi, (int *)argiData(*hitp), argiCount(*hitp), 0);
while ((oh = rpmmiNext(mi)) != NULL) {
if (!headerGet(oh, PNhe, 0))
goto bottom;
@@ -2911,7 +2911,7 @@
xx = argvAdd(avp, NVRAhe->p.str);
xx = argvSort(*avp, NULL);
if (hitp != NULL)
- xx = argiAdd(hitp, -1, rpmdbGetIteratorOffset(mi));
+ xx = argiAdd(hitp, -1, rpmmiInstance(mi));
rc++;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/librpmdb.vers
============================================================================
$ cvs diff -u -r1.64 -r1.65 librpmdb.vers
--- rpm/rpmdb/librpmdb.vers 14 May 2009 16:58:25 -0000 1.64
+++ rpm/rpmdb/librpmdb.vers 15 May 2009 13:40:59 -0000 1.65
@@ -87,10 +87,7 @@
rpmCheckPassPhrase;
rpmDatabasePoptTable;
_rpmdbPool;
- _rpmmi_debug;
- _rpmmiPool;
rpmdbAdd;
- rpmdbAppendIterator;
rpmDBArgs;
rpmdbCheckSignals;
rpmdbCheckTerminate;
@@ -100,25 +97,14 @@
rpmdbCount;
rpmdbCountPackages;
rpmdbFindFpList;
- rpmmiFree;
- rpmdbGetIteratorCount;
- rpmdbGetIteratorFileNum;
- rpmdbGetIteratorOffset;
rpmdbInit;
- rpmmiInit;
rpmdbMireApply;
- rpmmiNext;
rpmdbNew;
rpmdbOpen;
rpmdbOpenAll;
rpmdbOpenDatabase;
- rpmdbPruneIterator;
rpmdbRebuild;
rpmdbRemove;
- rpmdbSetHdrChk;
- rpmdbSetIteratorModified;
- rpmdbSetIteratorRE;
- rpmdbSetIteratorRewrite;
rpmdbSync;
rpmdbVerify;
rpmdbVerifyAllDBI;
@@ -131,6 +117,20 @@
rpmEVRnew;
rpmEVRoverlap;
rpmEVRparse;
+ _rpmmi_debug;
+ _rpmmiPool;
+ rpmmiAddPattern;
+ rpmmiFree;
+ rpmmiCount;
+ rpmmiFilenum;
+ rpmmiGrow;
+ rpmmiInstance;
+ rpmmiInit;
+ rpmmiNext;
+ rpmmiPrune;
+ rpmmiSetHdrChk;
+ rpmmiSetModified;
+ rpmmiSetRewrite;
_rpmns_debug;
_rpmns_N_at_A;
rpmnsArch;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/pkgio.c
============================================================================
$ cvs diff -u -r1.98 -r1.99 pkgio.c
--- rpm/rpmdb/pkgio.c 14 May 2009 16:58:25 -0000 1.98
+++ rpm/rpmdb/pkgio.c 15 May 2009 13:40:59 -0000 1.99
@@ -233,8 +233,8 @@
while ((h = rpmmiNext(mi)) != NULL) {
if (!headerGet(h, he, 0))
continue;
- hx = rpmdbGetIteratorOffset(mi);
- ix = rpmdbGetIteratorFileNum(mi);
+ hx = rpmmiInstance(mi);
+ ix = rpmmiFilenum(mi);
/*...@-moduncon -nullstate @*/
if (ix >= (unsigned) he->c
|| b64decode(he->p.argv[ix], (void **) &ts->pkpkt, &ts->pkpktlen))
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.296 -r1.297 rpmdb.c
--- rpm/rpmdb/rpmdb.c 14 May 2009 20:29:58 -0000 1.296
+++ rpm/rpmdb/rpmdb.c 15 May 2009 13:40:59 -0000 1.297
@@ -1709,13 +1709,13 @@
/* Set iterator selectors for version/release if available. */
if (version &&
- rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_DEFAULT, version))
+ rpmmiAddPattern(mi, RPMTAG_VERSION, RPMMIRE_DEFAULT, version))
{
rc = RPMRC_FAIL;
goto exit;
}
if (release &&
- rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_DEFAULT, release))
+ rpmmiAddPattern(mi, RPMTAG_RELEASE, RPMMIRE_DEFAULT, release))
{
rc = RPMRC_FAIL;
goto exit;
@@ -1988,15 +1988,15 @@
return (rpmmi) rpmioGetPool(pool, sizeof(*mi));
}
-unsigned int rpmdbGetIteratorOffset(rpmmi mi) {
+unsigned int rpmmiInstance(rpmmi mi) {
return (mi ? mi->mi_offset : 0);
}
-unsigned int rpmdbGetIteratorFileNum(rpmmi mi) {
+unsigned int rpmmiFilenum(rpmmi mi) {
return (mi ? mi->mi_filenum : 0);
}
-int rpmdbGetIteratorCount(rpmmi mi) {
+int rpmmiCount(rpmmi mi) {
return (mi && mi->mi_set ? mi->mi_set->count : 0);
}
@@ -2113,7 +2113,7 @@
return pat;
}
-int rpmdbSetIteratorRE(rpmmi mi, rpmTag tag,
+int rpmmiAddPattern(rpmmi mi, rpmTag tag,
rpmMireMode mode, const char * pattern)
{
static rpmMireMode defmode = (rpmMireMode)-1;
@@ -2324,7 +2324,7 @@
}
/*...@=onlytrans@*/
-int rpmdbSetIteratorRewrite(rpmmi mi, int rewrite)
+int rpmmiSetRewrite(rpmmi mi, int rewrite)
{
int rc;
if (mi == NULL)
@@ -2337,7 +2337,7 @@
return rc;
}
-int rpmdbSetIteratorModified(rpmmi mi, int modified)
+int rpmmiSetModified(rpmmi mi, int modified)
{
int rc;
if (mi == NULL)
@@ -2347,7 +2347,7 @@
return rc;
}
-int rpmdbSetHdrChk(rpmmi mi, rpmts ts)
+int rpmmiSetHdrChk(rpmmi mi, rpmts ts)
{
int rc = 0;
if (mi == NULL)
@@ -2643,8 +2643,7 @@
return rc;
}
-int rpmdbPruneIterator(rpmmi mi, int * hdrNums,
- int nHdrNums, int sorted)
+int rpmmiPrune(rpmmi mi, int * hdrNums, int nHdrNums, int sorted)
{
if (mi == NULL || hdrNums == NULL || nHdrNums <= 0)
return 1;
@@ -2654,7 +2653,7 @@
return 0;
}
-int rpmdbAppendIterator(rpmmi mi, const int * hdrNums, int nHdrNums)
+int rpmmiGrow(rpmmi mi, const int * hdrNums, int nHdrNums)
{
if (mi == NULL || hdrNums == NULL || nHdrNums <= 0)
return 1;
@@ -2715,7 +2714,7 @@
}
else if (keyp == NULL) {
/* XXX Special case #3: they want empty iterator,
- * for use with rpmdbAppendIterator(). */
+ * for use with rpmmiGrow(). */
assert(keylen == 0);
}
else {
@@ -3640,7 +3639,7 @@
}
- if ((i = rpmdbGetIteratorCount(mi)) == 0) {
+ if ((i = rpmmiCount(mi)) == 0) {
mi = rpmmiFree(mi);
return 0;
}
@@ -4048,11 +4047,11 @@
{ Header h = NULL;
rpmmi mi;
-#define _RECNUM rpmdbGetIteratorOffset(mi)
+#define _RECNUM rpmmiInstance(mi)
mi = rpmmiInit(olddb, RPMDBI_PACKAGES, NULL, 0);
if (ts)
- (void) rpmdbSetHdrChk(mi, ts);
+ (void) rpmmiSetHdrChk(mi, ts);
while ((h = rpmmiNext(mi)) != NULL) {
@@ -4086,9 +4085,9 @@
/*...@-shadow@*/
{ rpmmi mi;
mi = rpmmiInit(newdb, RPMTAG_NAME, name, 0);
- (void) rpmdbSetIteratorRE(mi, RPMTAG_VERSION,
+ (void) rpmmiAddPattern(mi, RPMTAG_VERSION,
RPMMIRE_DEFAULT, version);
- (void) rpmdbSetIteratorRE(mi, RPMTAG_RELEASE,
+ (void) rpmmiAddPattern(mi, RPMTAG_RELEASE,
RPMMIRE_DEFAULT, release);
while (rpmmiNext(mi)) {
skip = 1;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.h
============================================================================
$ cvs diff -u -r1.88 -r1.89 rpmdb.h
--- rpm/rpmdb/rpmdb.h 14 May 2009 20:29:58 -0000 1.88
+++ rpm/rpmdb/rpmdb.h 15 May 2009 13:41:00 -0000 1.89
@@ -1031,14 +1031,14 @@
* @param mi rpm database iterator
* @return current header join key
*/
-unsigned int rpmdbGetIteratorOffset(/*...@null@*/ rpmmi mi)
+unsigned int rpmmiInstance(/*...@null@*/ rpmmi mi)
/*...@*/;
/** \ingroup rpmdb
* Return header tag index join key for current position of rpmdb iterator.
* @param mi rpm database iterator
*/
-unsigned int rpmdbGetIteratorFileNum(rpmmi mi)
+unsigned int rpmmiFilenum(rpmmi mi)
/*...@*/;
/** \ingroup rpmdb
@@ -1046,7 +1046,7 @@
* @param mi rpm database iterator
* @return number of elements
*/
-int rpmdbGetIteratorCount(/*...@null@*/ rpmmi mi)
+int rpmmiCount(/*...@null@*/ rpmmi mi)
/*...@*/;
/** \ingroup rpmdb
@@ -1056,7 +1056,7 @@
* @param nHdrNums number of elements in array
* @return 0 on success, 1 on failure (bad args)
*/
-int rpmdbAppendIterator(/*...@null@*/ rpmmi mi,
+int rpmmiGrow(/*...@null@*/ rpmmi mi,
/*...@null@*/ const int * hdrNums, int nHdrNums)
/*...@modifies mi @*/;
@@ -1069,7 +1069,7 @@
* @param sorted is the array sorted? (array will be sorted on return)
* @return 0 on success, 1 on failure (bad args)
*/
-int rpmdbPruneIterator(/*...@null@*/ rpmmi mi,
+int rpmmiPrune(/*...@null@*/ rpmmi mi,
/*...@null@*/ int * hdrNums, int nHdrNums, int sorted)
/*...@modifies mi, hdrNums @*/;
@@ -1081,7 +1081,7 @@
* @param pattern pattern to match
* @return 0 on success
*/
-int rpmdbSetIteratorRE(/*...@null@*/ rpmmi mi, rpmTag tag,
+int rpmmiAddPattern(/*...@null@*/ rpmmi mi, rpmTag tag,
rpmMireMode mode, /*...@null@*/ const char * pattern)
/*...@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*...@modifies mi, mode, rpmGlobalMacroContext, internalState @*/;
@@ -1093,7 +1093,7 @@
* @param rewrite new value of rewrite
* @return previous value
*/
-int rpmdbSetIteratorRewrite(/*...@null@*/ rpmmi mi, int rewrite)
+int rpmmiSetRewrite(/*...@null@*/ rpmmi mi, int rewrite)
/*...@modifies mi @*/;
/** \ingroup rpmdb
@@ -1102,7 +1102,7 @@
* @param modified new value of modified
* @return previous value
*/
-int rpmdbSetIteratorModified(/*...@null@*/ rpmmi mi, int modified)
+int rpmmiSetModified(/*...@null@*/ rpmmi mi, int modified)
/*...@modifies mi @*/;
/** \ingroup rpmdb
@@ -1111,7 +1111,7 @@
* @param ts transaction set
* @return 0 always
*/
-int rpmdbSetHdrChk(/*...@null@*/ rpmmi mi, /*...@null@*/ rpmts ts)
+int rpmmiSetHdrChk(/*...@null@*/ rpmmi mi, /*...@null@*/ rpmts ts)
/*...@modifies mi @*/;
/** \ingroup rpmdb
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/rpmmi-rb.c
============================================================================
$ cvs diff -u -r1.6 -r1.7 rpmmi-rb.c
--- rpm/ruby/rpmmi-rb.c 14 May 2009 16:58:26 -0000 1.6
+++ rpm/ruby/rpmmi-rb.c 15 May 2009 13:41:00 -0000 1.7
@@ -60,7 +60,7 @@
rb_scan_args(argc, argv, "20", &v_tag, &v_pattern);
- rpmdbSetIteratorRE(mi, FIX2INT(v_tag), RPMMIRE_REGEX,
+ rpmmiAddPattern(mi, FIX2INT(v_tag), RPMMIRE_REGEX,
StringValueCStr(v_pattern));
return Qtrue;
@@ -93,14 +93,14 @@
rpmmi_count_get(VALUE s)
{
rpmmi mi = rpmmi_ptr(s);
- return INT2FIX(rpmdbGetIteratorCount(mi));
+ return INT2FIX(rpmmiCount(mi));
}
static VALUE
rpmmi_offset_get(VALUE s)
{
rpmmi mi = rpmmi_ptr(s);
- return INT2FIX(rpmdbGetIteratorOffset(mi));
+ return INT2FIX(rpmmiInstance(mi));
}
static void
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmcache.c
============================================================================
$ cvs diff -u -r2.39 -r2.40 rpmcache.c
--- rpm/tools/rpmcache.c 14 May 2009 16:58:26 -0000 2.39
+++ rpm/tools/rpmcache.c 15 May 2009 13:41:00 -0000 2.40
@@ -148,7 +148,7 @@
}
mi = rpmtsInitIterator(ts, RPMTAG_SIGMD5, md5, 16);
md5 = _free(md5);
- rc = rpmdbGetIteratorCount(mi);
+ rc = rpmmiCount(mi);
mi = rpmmiFree(mi);
if (rc) {
rc = 0;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
