Mass convert (back) to rpmTag as it's usable everywhere now

- cast away a few cases where the enum usage causes ridiculous amount
  of compiler warnings from unhandled switch-cases

20 files changed, 70 insertions, 61 deletions

diff --git a/lib/formats.c b/lib/formats.c
index 212f86d71..cb8f13c50 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -818,7 +818,7 @@ static const char * _macro_i18ndomains = "%{?_i18ndomains}";
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int i18nTag(Header h, rpm_tag_t tag, rpmTagType* type,
+static int i18nTag(Header h, rpmTag tag, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
diff --git a/lib/idtx.c b/lib/idtx.c
index f4391722b..5112cdcde 100644
--- a/lib/idtx.c
+++ b/lib/idtx.c
@@ -67,7 +67,7 @@ IDTX IDTXsort(IDTX idtx)
     return idtx;
 }
 
-IDTX IDTXload(rpmts ts, rpm_tag_t tag)
+IDTX IDTXload(rpmts ts, rpmTag tag)
 {
     IDTX idtx = NULL;
     rpmdbMatchIterator mi;
@@ -110,7 +110,7 @@ IDTX IDTXload(rpmts ts, rpm_tag_t tag)
     return IDTXsort(idtx);
 }
 
-IDTX IDTXglob(rpmts ts, const char * globstr, rpm_tag_t tag)
+IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag)
 {
     IDTX idtx = NULL;
     HGE_t hge = (HGE_t) headerGetEntry;
diff --git a/lib/idtx.h b/lib/idtx.h
index e25b28ce2..94881e7bd 100644
--- a/lib/idtx.h
+++ b/lib/idtx.h
@@ -64,7 +64,7 @@ IDTX IDTXsort(IDTX idtx);
  * @param tag		rpm tag
  * @return 		id index
  */
-IDTX IDTXload(rpmts ts, rpm_tag_t tag);
+IDTX IDTXload(rpmts ts, rpmTag tag);
 
 /**
  * Load tag (instance,value) pairs from packages, and return sorted id index.
@@ -73,7 +73,7 @@ IDTX IDTXload(rpmts ts, rpm_tag_t tag);
  * @param tag		rpm tag
  * @return 		id index
  */
-IDTX IDTXglob(rpmts ts, const char * globstr, rpm_tag_t tag);
+IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag);
 
 #ifdef __cplusplus
 }   
diff --git a/lib/package.c b/lib/package.c
index ce0129161..4d0d67c57 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -87,7 +87,7 @@ void headerMergeLegacySigs(Header h, const Header sigh)
     HAE_t hae = (HAE_t) headerAddEntry;
     HeaderIterator hi;
     rpmTagType type;
-    rpm_tag_t tag;
+    rpmTag tag;
     rpm_count_t count;
     rpm_data_t ptr;
     int xx;
@@ -169,7 +169,7 @@ Header headerRegenSigHeader(const Header h, int noArchiveSize)
     Header sigh = rpmNewSignature();
     HeaderIterator hi;
     rpm_count_t count;
-    rpm_tag_t tag, stag;
+    rpmTag tag, stag;
     rpmTagType type;
     rpm_data_t ptr;
     int xx;
@@ -682,7 +682,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
     ssize_t count;
     rpmlead l = NULL;
     Header sigh = NULL;
-    rpm_tag_t sigtag;
+    rpmSigTag sigtag;
     rpmTagType sigtype;
     rpm_data_t sig;
     rpm_count_t siglen;
@@ -897,6 +897,14 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
 
 	fdStealDigest(fd, dig);
 	break;
+    /* shut up gcc */
+    case RPMSIGTAG_LEMD5_1:
+    case RPMSIGTAG_LEMD5_2:
+    case RPMSIGTAG_BADSHA1_1:
+    case RPMSIGTAG_BADSHA1_2:
+    case RPMSIGTAG_SIZE:
+    case RPMSIGTAG_PAYLOADSIZE:
+	break;
     }
 
 /** @todo Implement disable/enable/warn/error/anal policy. */
diff --git a/lib/psm.c b/lib/psm.c
index a021e8c11..022b96cb4 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -108,7 +108,7 @@ int rpmVersionCompare(Header first, Header second)
  */
 static struct tagMacro {
 const char *	macroname; /*!< Macro name to define. */
-    rpm_tag_t	tag;		/*!< Header tag to use for value. */
+    rpmTag	tag;		/*!< Header tag to use for value. */
 } tagMacros[] = {
     { "name",		RPMTAG_NAME },
     { "version",	RPMTAG_VERSION },
@@ -439,9 +439,9 @@ static const char * SCRIPT_PATH = "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6
  * @param tag		scriptlet tag
  * @return		name of scriptlet
  */
-static const char * tag2sln(rpm_tag_t tag)
+static const char * tag2sln(rpmTag tag)
 {
-    switch (tag) {
+    switch ((rpm_tag_t) tag) {
     case RPMTAG_PRETRANS:       return "%pretrans";
     case RPMTAG_TRIGGERPREIN:   return "%triggerprein";
     case RPMTAG_PREIN:          return "%pre";
@@ -453,13 +453,14 @@ static const char * tag2sln(rpm_tag_t tag)
     case RPMTAG_POSTTRANS:      return "%posttrans";
     case RPMTAG_TRIGGERPOSTUN:  return "%triggerpostun";
     case RPMTAG_VERIFYSCRIPT:   return "%verify";
+    default: break;
     }
     return "%unknownscript";
 }
 
-static rpm_tag_t triggertag(rpmsenseFlags sense) 
+static rpmTag triggertag(rpmsenseFlags sense) 
 {
-    rpm_tag_t tag = RPMTAG_NOT_FOUND;
+    rpmTag tag = RPMTAG_NOT_FOUND;
     switch (sense) {
     case RPMSENSE_TRIGGERIN:
 	tag = RPMTAG_TRIGGERIN;
@@ -506,7 +507,7 @@ static pid_t psmWait(rpmpsm psm)
 /**
  * Run internal Lua script.
  */
-static rpmRC runLuaScript(rpmpsm psm, Header h, rpm_tag_t stag,
+static rpmRC runLuaScript(rpmpsm psm, Header h, rpmTag stag,
 		   unsigned int progArgc, const char **progArgv,
 		   const char *script, int arg1, int arg2)
 {
@@ -603,7 +604,7 @@ static const char * ldconfig_path = "/sbin/ldconfig";
  * @param arg2		ditto, but for the target package
  * @return		0 on success
  */
-static rpmRC runScript(rpmpsm psm, Header h, rpm_tag_t stag,
+static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag,
 		unsigned int progArgc, const char ** progArgv,
 		const char * script, int arg1, int arg2)
 {
@@ -1224,7 +1225,7 @@ void rpmpsmSetAsync(rpmpsm psm, int async)
     psm->unorderedSuccessor = async;
 }
 
-rpmRC rpmpsmScriptStage(rpmpsm psm, rpm_tag_t scriptTag, rpm_tag_t progTag)
+rpmRC rpmpsmScriptStage(rpmpsm psm, rpmTag scriptTag, rpmTag progTag)
 {
     assert(psm != NULL);
     psm->scriptTag = scriptTag;
@@ -1528,7 +1529,7 @@ assert(psm->mi == NULL);
 		{
 		    HeaderIterator hi;
 		    rpmTagType type;
-		    rpm_tag_t tag;
+		    rpmTag tag;
 		    rpm_count_t count;
 		    rpm_data_t ptr;
 		    Header oh;
diff --git a/lib/psm.h b/lib/psm.h
index f86ee0eec..d5ba5445a 100644
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -113,7 +113,7 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage);
  * @param progTag	scriptlet prog tag to execute
  * @return 		0 on success
  */
-rpmRC rpmpsmScriptStage(rpmpsm psm, rpm_tag_t scriptTag, rpm_tag_t progTag);
+rpmRC rpmpsmScriptStage(rpmpsm psm, rpmTag scriptTag, rpmTag progTag);
 
 /**
  * @param psm		package state machine data
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 791c67b3f..a6cf55c62 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -211,7 +211,7 @@ static int rpmReSign(rpmts ts,
 	if (headerGetEntry(sigh, RPMTAG_HEADERSIGNATURES, &uht, &uh, &uhc)) {
 	    HeaderIterator hi;
 	    rpmTagType type;
-	    rpm_tag_t tag;
+	    rpmTag tag;
 	    rpm_count_t count;
 	    rpm_data_t ptr;
 	    Header oh;
@@ -524,7 +524,7 @@ int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd,
     char buf[8192], * b;
     char missingKeys[7164], * m;
     char untrustedKeys[7164], * u;
-    rpmSigTag sigtag;
+    rpmTag sigtag;
     rpmTagType sigtype;
     rpm_data_t sig;
     pgpDig dig;
diff --git a/lib/rpmds.c b/lib/rpmds.c
index e458cd468..8bc6b7381 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -35,7 +35,7 @@ struct rpmds_s {
     rpm_color_t * Color;	/*!< Bit(s) calculated from file color(s). */
     int32_t * Refs;		/*!< No. of file refs. */
     time_t BT;			/*!< Package build time tie breaker. */
-    rpm_tag_t tagN;		/*!< Header tag. */
+    rpmTag tagN;		/*!< Header tag. */
     rpmTagType Nt, EVRt, Ft;	/*!< Tag data types. */
     int32_t Count;		/*!< No. of elements */
     int i;			/*!< Element index. */
@@ -45,13 +45,13 @@ struct rpmds_s {
     int nrefs;			/*!< Reference count. */
 };
 
-static int dsType(rpm_tag_t tag, 
-		  const char ** Type, rpm_tag_t * tagEVR, rpm_tag_t * tagF)
+static int dsType(rpmTag tag, 
+		  const char ** Type, rpmTag * tagEVR, rpmTag * tagF)
 {
     int rc = 0;
     const char *t = NULL;
-    rpm_tag_t evr = RPMTAG_NOT_FOUND;
-    rpm_tag_t f = RPMTAG_NOT_FOUND;
+    rpmTag evr = RPMTAG_NOT_FOUND;
+    rpmTag f = RPMTAG_NOT_FOUND;
 
     if (tag == RPMTAG_PROVIDENAME) {
 	t = "Provides";
@@ -105,7 +105,7 @@ fprintf(stderr, "--> ds %p ++ %d %s\n", ds, ds->nrefs, msg);
 rpmds rpmdsFree(rpmds ds)
 {
     HFD_t hfd = headerFreeData;
-    rpm_tag_t tagEVR, tagF;
+    rpmTag tagEVR, tagF;
 
     if (ds == NULL)
 	return NULL;
@@ -136,15 +136,15 @@ fprintf(stderr, "*** ds %p\t%s[%d]\n", ds, ds->Type, ds->Count);
     return NULL;
 }
 
-rpmds rpmdsNew(Header h, rpm_tag_t tagN, int flags)
+rpmds rpmdsNew(Header h, rpmTag tagN, int flags)
 {
     int scareMem = (flags & 0x1);
     HGE_t hge =
 	(scareMem ? (HGE_t) headerGetEntryMinMemory : (HGE_t) headerGetEntry);
-    rpm_tag_t tagBT = RPMTAG_BUILDTIME;
+    rpmTag tagBT = RPMTAG_BUILDTIME;
     rpmTagType BTt;
     rpm_time_t * BTp;
-    rpm_tag_t tagEVR, tagF;
+    rpmTag tagEVR, tagF;
     rpmds ds = NULL;
     const char * Type;
     const char ** N;
@@ -236,7 +236,7 @@ char * rpmdsNewDNEVR(const char * dspfx, const rpmds ds)
     return tbuf;
 }
 
-rpmds rpmdsThis(Header h, rpm_tag_t tagN, rpmsenseFlags Flags)
+rpmds rpmdsThis(Header h, rpmTag tagN, rpmsenseFlags Flags)
 {
     HGE_t hge = (HGE_t) headerGetEntryMinMemory;
     rpmds ds = NULL;
@@ -295,7 +295,7 @@ exit:
     return rpmdsLink(ds, (ds ? ds->Type : RPMDBG()));
 }
 
-rpmds rpmdsSingle(rpm_tag_t tagN, const char * N, const char * EVR, rpmsenseFlags Flags)
+rpmds rpmdsSingle(rpmTag tagN, const char * N, const char * EVR, rpmsenseFlags Flags)
 {
     rpmds ds = NULL;
     const char * Type;
@@ -392,9 +392,9 @@ rpmsenseFlags rpmdsFlags(const rpmds ds)
     return Flags;
 }
 
-rpm_tag_t rpmdsTagN(const rpmds ds)
+rpmTag rpmdsTagN(const rpmds ds)
 {
-    rpm_tag_t tagN = 0;
+    rpmTag tagN = 0;
 
     if (ds != NULL)
 	tagN = ds->tagN;
diff --git a/lib/rpmds.h b/lib/rpmds.h
index 24e8e1e4e..64fda9a60 100644
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -121,7 +121,7 @@ rpmds rpmdsFree(rpmds ds);
  * @param flags		scareMem(0x1)
  * @return		new dependency set
  */
-rpmds rpmdsNew(Header h, rpm_tag_t tagN, int flags);
+rpmds rpmdsNew(Header h, rpmTag tagN, int flags);
 
 /** \ingroup rpmds
  * Return new formatted dependency string.
@@ -138,7 +138,7 @@ char * rpmdsNewDNEVR(const char * dspfx, const rpmds ds);
  * @param Flags		comparison flags
  * @return		new dependency set
  */
-rpmds rpmdsThis(Header h, rpm_tag_t tagN, rpmsenseFlags Flags);
+rpmds rpmdsThis(Header h, rpmTag tagN, rpmsenseFlags Flags);
 
 /** \ingroup rpmds
  * Create, load and initialize a dependency set of size 1.
@@ -148,7 +148,7 @@ rpmds rpmdsThis(Header h, rpm_tag_t tagN, rpmsenseFlags Flags);
  * @param Flags		comparison flags
  * @return		new dependency set
  */
-rpmds rpmdsSingle(rpm_tag_t tagN, const char * N, const char * EVR, rpmsenseFlags Flags);
+rpmds rpmdsSingle(rpmTag tagN, const char * N, const char * EVR, rpmsenseFlags Flags);
 
 /** \ingroup rpmds
  * Return dependency set count.
@@ -205,7 +205,7 @@ rpmsenseFlags rpmdsFlags(const rpmds ds);
  * @param ds		dependency set
  * @return		current dependency type, 0 on invalid
  */
-rpm_tag_t rpmdsTagN(const rpmds ds);
+rpmTag rpmdsTagN(const rpmds ds);
 
 /** \ingroup rpmds
  * Return dependency build time.
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index a5ac61671..7001a607f 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -1137,7 +1137,7 @@ static inline unsigned char nibble(char c)
     if (hge((_h), (_tag), NULL, (rpm_data_t *) &(_data), NULL)) \
 	_data = xstrdup(_data)
 
-rpmfi rpmfiNew(const rpmts ts, Header h, rpm_tag_t tagN, int scareMem)
+rpmfi rpmfiNew(const rpmts ts, Header h, rpmTag tagN, int scareMem)
 {
     HGE_t hge =
 	(scareMem ? (HGE_t) headerGetEntryMinMemory : (HGE_t) headerGetEntry);
@@ -1384,7 +1384,7 @@ exit:
     if (fcp) *fcp = ac;
 }
 
-void rpmfiBuildFDeps(Header h, rpm_tag_t tagN,
+void rpmfiBuildFDeps(Header h, rpmTag tagN,
 	const char *** fdepsp, rpm_count_t * fcp)
 {
     int scareMem = 0;
@@ -1479,7 +1479,7 @@ exit:
     if (fcp) *fcp = ac;
 }
 
-void rpmfiBuildFNames(Header h, rpm_tag_t tagN,
+void rpmfiBuildFNames(Header h, rpmTag tagN,
 	const char *** fnp, rpm_count_t * fcp)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
@@ -1490,8 +1490,8 @@ void rpmfiBuildFNames(Header h, rpm_tag_t tagN,
     rpm_count_t count;
     const char ** fileNames;
     int size;
-    rpm_tag_t dirNameTag = 0;
-    rpm_tag_t dirIndexesTag = 0;
+    rpmTag dirNameTag = 0;
+    rpmTag dirIndexesTag = 0;
     rpmTagType bnt, dnt;
     char * t;
     int i, xx;
diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index ae4748f2c..aba449f0a 100644
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -351,7 +351,7 @@ rpmfi rpmfiFree(rpmfi fi);
  * @param scareMem	Use pointers to refcounted header memory?
  * @return		new file info set
  */
-rpmfi rpmfiNew(const rpmts ts, Header h, rpm_tag_t tagN, int scareMem);
+rpmfi rpmfiNew(const rpmts ts, Header h, rpmTag tagN, int scareMem);
 
 /** \ingroup rpmfi
  * Retrieve file classes from header.
@@ -376,7 +376,7 @@ void rpmfiBuildFClasses(Header h,
  * @retval *fdepsp	array of file dependencies
  * @retval *fcp		number of files
  */
-void rpmfiBuildFDeps(Header h, rpm_tag_t tagN,
+void rpmfiBuildFDeps(Header h, rpmTag tagN,
 		const char *** fdepsp, rpm_count_t * fcp);
 
 /** \ingroup rpmfi
@@ -396,7 +396,7 @@ void rpmfiBuildFDeps(Header h, rpm_tag_t tagN,
  * @retval *fnp		array of file names
  * @retval *fcp		number of files
  */
-void rpmfiBuildFNames(Header h, rpm_tag_t tagN,
+void rpmfiBuildFNames(Header h, rpmTag tagN,
 		const char *** fnp, rpm_count_t * fcp);
 
 /** \ingroup rpmfi
diff --git a/lib/rpmfi_internal.h b/lib/rpmfi_internal.h
index 0853a7a11..f3900a063 100644
--- a/lib/rpmfi_internal.h
+++ b/lib/rpmfi_internal.h
@@ -27,7 +27,7 @@ struct rpmfi_s {
 
     const char * Type;		/*!< Tag name. */
 
-    rpm_tag_t tagN;		/*!< Header tag. */
+    rpmTag tagN;		/*!< Header tag. */
     Header h;			/*!< Header for file info set (or NULL) */
 
 /*?null?*/
diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index 7aa5a9ba7..d65d0cccf 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -26,7 +26,7 @@ rpmgiFlags giFlags = RPMGI_NONE;
  */
 struct rpmgi_s {
     rpmts ts;			/*!< Iterator transaction set. */
-    rpm_tag_t tag;		/*!< Iterator type. */
+    rpmTag tag;		/*!< Iterator type. */
     const void * keyp;		/*!< Iterator key. */
     size_t keylen;		/*!< Iterator key length. */
 
@@ -341,7 +341,7 @@ fprintf(stderr, "*** gi %p\tmi %p\n", gi, gi->mi);
 
     if (gi->argv != NULL)
     for (av = (const char **) gi->argv; *av != NULL; av++) {
-	rpm_tag_t tag = RPMTAG_NAME;
+	rpmTag tag = RPMTAG_NAME;
 	const char * pat;
 	char * a, * ae;
 
@@ -434,7 +434,7 @@ rpmgi rpmgiFree(rpmgi gi)
     return NULL;
 }
 
-rpmgi rpmgiNew(rpmts ts, rpm_tag_t tag, const void * keyp, size_t keylen)
+rpmgi rpmgiNew(rpmts ts, rpmTag tag, const void * keyp, size_t keylen)
 {
     rpmgi gi = xcalloc(1, sizeof(*gi));
 
diff --git a/lib/rpmgi.h b/lib/rpmgi.h
index 137630b8a..e693be001 100644
--- a/lib/rpmgi.h
+++ b/lib/rpmgi.h
@@ -72,7 +72,7 @@ rpmgi rpmgiFree(rpmgi gi);
  * @param keylen	key data length (0 will use strlen(keyp))
  * @return		new iterator
  */
-rpmgi rpmgiNew(rpmts ts, rpm_tag_t tag, const void * keyp,
+rpmgi rpmgiNew(rpmts ts, rpmTag tag, const void * keyp,
 		size_t keylen);
 
 /** \ingroup rpmgi
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 67c218d01..294bab8a0 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -471,7 +471,7 @@ fnpyKey rpmteKey(rpmte te)
     return (te != NULL ? te->key : NULL);
 }
 
-rpmds rpmteDS(rpmte te, rpm_tag_t tag)
+rpmds rpmteDS(rpmte te, rpmTag tag)
 {
     if (te == NULL)
 	return NULL;
@@ -494,7 +494,7 @@ rpmds rpmteDS(rpmte te, rpm_tag_t tag)
 	return NULL;
 }
 
-rpmfi rpmteFI(rpmte te, rpm_tag_t tag)
+rpmfi rpmteFI(rpmte te, rpmTag tag)
 {
     if (te == NULL)
 	return NULL;
@@ -505,7 +505,7 @@ rpmfi rpmteFI(rpmte te, rpm_tag_t tag)
 	return NULL;
 }
 
-void rpmteColorDS(rpmte te, rpm_tag_t tag)
+void rpmteColorDS(rpmte te, rpmTag tag)
 {
     rpmfi fi = rpmteFI(te, RPMTAG_BASENAMES);
     rpmds ds = rpmteDS(te, tag);
diff --git a/lib/rpmte.h b/lib/rpmte.h
index c37975460..b1f74cf4e 100644
--- a/lib/rpmte.h
+++ b/lib/rpmte.h
@@ -346,7 +346,7 @@ fnpyKey rpmteKey(rpmte te);
  * @param tag		dependency tag
  * @return		dependency tag set
  */
-rpmds rpmteDS(rpmte te, rpm_tag_t tag);
+rpmds rpmteDS(rpmte te, rpmTag tag);
 
 /** \ingroup rpmte
  * Retrieve file info tag set from transaction element.
@@ -354,14 +354,14 @@ rpmds rpmteDS(rpmte te, rpm_tag_t tag);
  * @param tag		file info tag (RPMTAG_BASENAMES)
  * @return		file info tag set
  */
-rpmfi rpmteFI(rpmte te, rpm_tag_t tag);
+rpmfi rpmteFI(rpmte te, rpmTag tag);
 
 /** \ingroup rpmte
  * Calculate transaction element dependency colors/refs from file info.
  * @param te		transaction element
  * @param tag		dependency tag (RPMTAG_PROVIDENAME, RPMTAG_REQUIRENAME)
  */
-void rpmteColorDS(rpmte te, rpm_tag_t tag);
+void rpmteColorDS(rpmte te, rpmTag tag);
 
 /** \ingroup rpmte
  * Return transaction element index.
diff --git a/lib/rpmts.c b/lib/rpmts.c
index 0bedb9c85..4e3dbc310 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -177,7 +177,7 @@ static int isArch(const char * arch)
 }
 
 /* keyp might no be defined. */
-rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpm_tag_t rpmtag,
+rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
 			const void * keyp, size_t keylen)
 {
     rpmdbMatchIterator mi;
@@ -598,7 +598,7 @@ int rpmtsSolve(rpmts ts, rpmds ds, const void * data)
     Header h;
     size_t bhnamelen;
     time_t bhtime;
-    rpm_tag_t rpmtag;
+    rpmTag rpmtag;
     const char * keyp;
     size_t keylen;
     int rc = 1;	/* assume not found */
diff --git a/lib/rpmts.h b/lib/rpmts.h
index 619fb4064..e036107e9 100644
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -283,7 +283,7 @@ int rpmtsVerifyDB(rpmts ts);
  * @param keylen	key data length (0 will use strlen(keyp))
  * @return		NULL on failure
  */
-rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpm_tag_t rpmtag,
+rpmdbMatchIterator rpmtsInitIterator(const rpmts ts, rpmTag rpmtag,
 			const void * keyp, size_t keylen);
 
 /** \ingroup rpmts
diff --git a/lib/tds.c b/lib/tds.c
index 0389b5b6c..2f25b71d1 100644
--- a/lib/tds.c
+++ b/lib/tds.c
@@ -9,7 +9,7 @@ extern int _rpmds_debug;
 
 int main(int argc, char *argv[])
 {
-    rpm_tag_t tagN = RPMTAG_REQUIRENAME;
+    rpmTag tagN = RPMTAG_REQUIRENAME;
     rpmds ds = NULL;
     rpmds dsA;
     rpmds dsA1;
diff --git a/lib/tgi.c b/lib/tgi.c
index de28a6b36..6449e8698 100644
--- a/lib/tgi.c
+++ b/lib/tgi.c
@@ -83,7 +83,7 @@ main(int argc, char *argv[])
     rpmts ts = NULL;
     rpmVSFlags vsflags;
     rpmgi gi = NULL;
-    rpm_tag_t gitag = RPMDBI_PACKAGES;
+    rpmTag gitag = RPMDBI_PACKAGES;
     const char ** av;
     int ac;
     int rc = 0;