Change all internal uses of rpmtsInitIterator() to use DBI tags

diff --git a/lib/depends.c b/lib/depends.c
index 177e21b..3cc0d64 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -87,7 +87,7 @@ static int removePackage(rpmts ts, Header h, rpmte depends)
 }
 
 /* Return rpmdb iterator with removals pruned out */
-static rpmdbMatchIterator rpmtsPrunedIterator(rpmts ts, rpmTag tag, const char * key)
+static rpmdbMatchIterator rpmtsPrunedIterator(rpmts ts, rpmDbiTagVal tag, const char * key)
 {
     rpmdbMatchIterator mi = rpmtsInitIterator(ts, tag, key, 0);
     tsMembers tsmem = rpmtsMembers(ts);
@@ -103,7 +103,7 @@ static void addUpgradeErasures(rpmts ts, tsMembers tsmem, rpm_color_t tscolor,
                                rpmte p, rpm_color_t hcolor, Header h)
 {
     Header oh;
-    rpmdbMatchIterator mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(p), 0);
+    rpmdbMatchIterator mi = rpmtsInitIterator(ts, RPMDBI_NAME, rpmteN(p), 0);
 
     while((oh = rpmdbNextIterator(mi)) != NULL) {
        /* Ignore colored packages not in our rainbow. */
@@ -137,7 +137,7 @@ static void addObsoleteErasures(rpmts ts, tsMembers tsmem, rpm_color_t tscolor,
        if (rstreq(rpmteN(p), Name))
            continue;
 
-       mi = rpmtsPrunedIterator(ts, RPMTAG_NAME, Name);
+       mi = rpmtsPrunedIterator(ts, RPMDBI_NAME, Name);
 
        while((oh = rpmdbNextIterator(mi)) != NULL) {
            /* Ignore colored packages not in our rainbow. */
@@ -347,7 +347,7 @@ static int rpmdbProvides(rpmts ts, depCache dcache, rpmds dep)
 
     /* See if a filename dependency is a real file in some package */
     if (Name[0] == '/') {
-       mi = rpmtsPrunedIterator(ts, RPMTAG_BASENAMES, Name);
+       mi = rpmtsPrunedIterator(ts, RPMDBI_BASENAMES, Name);
        while ((h = rpmdbNextIterator(mi)) != NULL) {
            rpmdsNotify(dep, "(db files)", rc);
            break;
@@ -357,7 +357,7 @@ static int rpmdbProvides(rpmts ts, depCache dcache, rpmds dep)
 
     /* Otherwise look in provides no matter what the dependency looks like */
     if (h == NULL) {
-       mi = rpmtsPrunedIterator(ts, RPMTAG_PROVIDENAME, Name);
+       mi = rpmtsPrunedIterator(ts, RPMDBI_PROVIDENAME, Name);
        while ((h = rpmdbNextIterator(mi)) != NULL) {
            if (rpmdsAnyMatchesDep(h, dep, _rpmds_nopromote)) {
                rpmdsNotify(dep, "(db provides)", rc);

diff --git a/lib/psm.c b/lib/psm.c
index 0f7d9df..0627949 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -591,7 +591,7 @@ static rpmRC runTriggers(rpmpsm psm)
        int countCorrection = psm->countCorrection;
 
        psm->countCorrection = 0;
-       mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, N, 0);
+       mi = rpmtsInitIterator(ts, RPMDBI_TRIGGERNAME, N, 0);
        while((triggeredH = rpmdbNextIterator(mi)) != NULL)
            nerrors += handleOneTrigger(psm, h, triggeredH, numPackage, NULL);
        mi = rpmdbFreeIterator(mi);
@@ -631,7 +631,7 @@ static rpmRC runImmedTriggers(rpmpsm psm)
 
            if (triggersRun[triggerIndices[i]] != 0) continue;
        
-           mi = rpmtsInitIterator(ts, RPMTAG_NAME, trigName, 0);
+           mi = rpmtsInitIterator(ts, RPMDBI_NAME, trigName, 0);
 
            while((sourceH = rpmdbNextIterator(mi)) != NULL) {
                nerrors += handleOneTrigger(psm, sourceH, h,
@@ -726,7 +726,7 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage)
 
            psm->scriptArg = psm->npkgs_installed + 1;
 
-           mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(psm->te), 0);
+           mi = rpmtsInitIterator(ts, RPMDBI_NAME, rpmteN(psm->te), 0);
            xx = rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP,
                        rpmteE(psm->te));
            xx = rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP,

diff --git a/lib/query.c b/lib/query.c
index 2dd6de1..0a70fe6 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -313,7 +313,7 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar
 
     switch (qva->qva_source) {
     case RPMQV_GROUP:
-       mi = rpmtsInitIterator(ts, RPMTAG_GROUP, arg, 0);
+       mi = rpmtsInitIterator(ts, RPMDBI_GROUP, arg, 0);
        if (mi == NULL) {
            rpmlog(RPMLOG_NOTICE,
                _("group %s does not contain any packages\n"), arg);
@@ -321,7 +321,7 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar
        break;
 
     case RPMQV_TRIGGEREDBY:
-       mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, arg, 0);
+       mi = rpmtsInitIterator(ts, RPMDBI_TRIGGERNAME, arg, 0);
        if (mi == NULL) {
            rpmlog(RPMLOG_NOTICE, _("no package triggers %s\n"), arg);
        }
@@ -342,7 +342,7 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar
         for (i = 0, t = MD5, s = arg; i < 16; i++, t++, s += 2)
             *t = (rnibble(s[0]) << 4) | rnibble(s[1]);
        
-       mi = rpmtsInitIterator(ts, RPMTAG_SIGMD5, MD5, sizeof(MD5));
+       mi = rpmtsInitIterator(ts, RPMDBI_SIGMD5, MD5, sizeof(MD5));
        if (mi == NULL) {
            rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"),
                        "pkgid", arg);
@@ -357,7 +357,7 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar
            goto exit;
        }
 
-       mi = rpmtsInitIterator(ts, RPMTAG_SHA1HEADER, arg, 0);
+       mi = rpmtsInitIterator(ts, RPMDBI_SHA1HEADER, arg, 0);
        if (mi == NULL) {
            rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"),
                        "hdrid", arg);
@@ -372,7 +372,7 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar
            rpmlog(RPMLOG_ERR, _("malformed %s: %s\n"), "tid", arg);
            goto exit;
        }
-       mi = rpmtsInitIterator(ts, RPMTAG_INSTALLTID, &iid, sizeof(iid));
+       mi = rpmtsInitIterator(ts, RPMDBI_INSTALLTID, &iid, sizeof(iid));
        if (mi == NULL) {
            rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"),
                        "tid", arg);
@@ -380,7 +380,7 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar
     }  break;
 
     case RPMQV_WHATREQUIRES:
-       mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, arg, 0);
+       mi = rpmtsInitIterator(ts, RPMDBI_REQUIRENAME, arg, 0);
        if (mi == NULL) {
            rpmlog(RPMLOG_NOTICE, _("no package requires %s\n"), arg);
        }
@@ -389,7 +389,7 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar
     case RPMQV_WHATPROVIDES:
        if (arg[0] != '/') {
            provides_checked = 1;
-           mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, arg, 0);
+           mi = rpmtsInitIterator(ts, RPMDBI_PROVIDENAME, arg, 0);
            if (mi == NULL) {
                rpmlog(RPMLOG_NOTICE, _("no package provides %s\n"), arg);
            }
@@ -414,9 +414,9 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar
            fn = xstrdup(arg);
        (void) rpmCleanPath(fn);
 
-       mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, fn, 0);
+       mi = rpmtsInitIterator(ts, RPMDBI_BASENAMES, fn, 0);
        if (mi == NULL && !provides_checked)
-           mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, fn, 0);
+           mi = rpmtsInitIterator(ts, RPMDBI_PROVIDENAME, fn, 0);
 
        if (mi == NULL) {
            struct stat sb;

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 0ceaead..072d11e 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -359,7 +359,7 @@ static int checkFreshenStatus(rpmts ts, struct rpmEIU * eiu)
     Header oldH = NULL;
 
     if (name != NULL)
-        mi = rpmtsInitIterator(ts, RPMTAG_NAME, name, 0);
+        mi = rpmtsInitIterator(ts, RPMDBI_NAME, name, 0);
     if (rpmtsColor(ts) && arch)
        rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_DEFAULT, arch);
 

diff --git a/lib/rpmts.c b/lib/rpmts.c
index e6d5d08..228ceb8 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -302,7 +302,7 @@ static int loadKeyringFromDB(rpmts ts)
     int nkeys = 0;
 
     rpmlog(RPMLOG_DEBUG, "loading keyring from rpmdb\n");
-    mi = rpmtsInitIterator(ts, RPMTAG_NAME, "gpg-pubkey", 0);
+    mi = rpmtsInitIterator(ts, RPMDBI_NAME, "gpg-pubkey", 0);
     while ((h = rpmdbNextIterator(mi)) != NULL) {
        struct rpmtd_s pubkeys;
        const char *key;

diff --git a/lib/transaction.c b/lib/transaction.c
index e394454..13852fc 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -878,7 +878,7 @@ rpmdbMatchIterator rpmFindBaseNamesInDB(rpmts ts, uint64_t fileCount)
     rpmStringSet baseNames = rpmStringSetCreate(fileCount, 
                                        hashFunctionString, strcmp, NULL);
 
-    mi = rpmdbInitIterator(rpmtsGetRdb(ts), RPMTAG_BASENAMES, NULL, 0);
+    mi = rpmdbInitIterator(rpmtsGetRdb(ts), RPMDBI_BASENAMES, NULL, 0);
 
     pi = rpmtsiInit(ts);
     while ((p = rpmtsiNext(pi, 0)) != NULL) {
@@ -1063,7 +1063,7 @@ static rpmps checkProblems(rpmts ts)
 
        if (!(probFilter & RPMPROB_FILTER_OLDPACKAGE)) {
            Header h;
-           mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(p), 0);
+           mi = rpmtsInitIterator(ts, RPMDBI_NAME, rpmteN(p), 0);
            while ((h = rpmdbNextIterator(mi)) != NULL)
                ensureOlder(p, h);
            mi = rpmdbFreeIterator(mi);
@@ -1071,7 +1071,7 @@ static rpmps checkProblems(rpmts ts)
 
        if (!(probFilter & RPMPROB_FILTER_REPLACEPKG)) {
            Header h;
-           mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(p), 0);
+           mi = rpmtsInitIterator(ts, RPMDBI_NAME, rpmteN(p), 0);
            rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, rpmteE(p));
            rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, rpmteV(p));
            rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP, rpmteR(p));

diff --git a/lib/verify.c b/lib/verify.c
index 1c3769d..d961353 100644 (file)
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -353,7 +353,7 @@ static int verifyHeader(rpmts ts, Header h, rpmVerifyAttrs omitMask, int ghosts)
        /* Filter out timestamp differences of shared files */
        if (rc == 0 && (verifyResult & RPMVERIFY_MTIME)) {
            rpmdbMatchIterator mi;
-           mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, rpmfiFN(fi), 0);
+           mi = rpmtsInitIterator(ts, RPMDBI_BASENAMES, rpmfiFN(fi), 0);
            if (rpmdbGetIteratorCount(mi) > 1) 
                verifyResult &= ~RPMVERIFY_MTIME;
            rpmdbFreeIterator(mi);