Use rpmTagType always now that it's available everywhere

- RPM_MASK_TYPE is not a datatype, move it out of the enum
- add missing cases python header handling to shut up gcc

15 files changed, 61 insertions, 61 deletions

diff --git a/lib/formats.c b/lib/formats.c
index 0b75e5b9f..212f86d71 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -25,7 +25,7 @@
  * @param element	(unused)
  * @return		formatted string
  */
-static char * triggertypeFormat(rpm_tagtype_t type, rpm_constdata_t data, 
+static char * triggertypeFormat(rpmTagType type, rpm_constdata_t data, 
 		char * formatPrefix, size_t padding,
 		int element)
 {
@@ -56,7 +56,7 @@ static char * triggertypeFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @param element	(unused)
  * @return		formatted string
  */
-static char * permsFormat(rpm_tagtype_t type, rpm_constdata_t data,
+static char * permsFormat(rpmTagType type, rpm_constdata_t data,
 		char * formatPrefix, size_t padding, int element)
 {
     char * val;
@@ -84,7 +84,7 @@ static char * permsFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @param element	(unused)
  * @return		formatted string
  */
-static char * fflagsFormat(rpm_tagtype_t type, rpm_constdata_t data, 
+static char * fflagsFormat(rpmTagType type, rpm_constdata_t data, 
 		char * formatPrefix, size_t padding, int element)
 {
     char * val;
@@ -130,7 +130,7 @@ static char * fflagsFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @param element	no. bytes of binary data
  * @return		formatted string
  */
-static char * armorFormat(rpm_tagtype_t type, rpm_constdata_t data, 
+static char * armorFormat(rpmTagType type, rpm_constdata_t data, 
 		char * formatPrefix, size_t padding,
 		int element)
 {
@@ -180,7 +180,7 @@ static char * armorFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @param element
  * @return		formatted string
  */
-static char * base64Format(rpm_tagtype_t type, rpm_constdata_t data, 
+static char * base64Format(rpmTagType type, rpm_constdata_t data, 
 		char * formatPrefix, size_t padding, int element)
 {
     char * val;
@@ -256,7 +256,7 @@ static char * xmlstrcpy(char * t, const char * s)
  * @param element	(unused)
  * @return		formatted string
  */
-static char * xmlFormat(rpm_tagtype_t type, rpm_constdata_t data, 
+static char * xmlFormat(rpmTagType type, rpm_constdata_t data, 
 		char * formatPrefix, size_t padding,
 		int element)
 {
@@ -347,7 +347,7 @@ static char * xmlFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @param element	(unused)
  * @return		formatted string
  */
-static char * pgpsigFormat(rpm_tagtype_t type, rpm_constdata_t data, 
+static char * pgpsigFormat(rpmTagType type, rpm_constdata_t data, 
 		char * formatPrefix, size_t padding,
 		int element)
 {
@@ -454,7 +454,7 @@ static char * pgpsigFormat(rpm_tagtype_t type, rpm_constdata_t data,
  * @param element	(unused)
  * @return		formatted string
  */
-static char * depflagsFormat(rpm_tagtype_t type, rpm_constdata_t data, 
+static char * depflagsFormat(rpmTagType type, rpm_constdata_t data, 
 		char * formatPrefix, size_t padding, int element)
 {
     char * val;
@@ -516,14 +516,14 @@ static int fsnamesTag( Header h, int32_t * type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int instprefixTag(Header h, rpm_tagtype_t* type,
+static int instprefixTag(Header h, rpmTagType* type,
 		rpm_data_t * data,
 		rpm_count_t * count,
 		int * freeData)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     HFD_t hfd = headerFreeData;
-    rpm_tagtype_t ipt;
+    rpmTagType ipt;
     char ** array;
 
     if (hge(h, RPMTAG_INSTALLPREFIX, type, (rpm_data_t *)data, count)) {
@@ -549,7 +549,7 @@ static int instprefixTag(Header h, rpm_tagtype_t* type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int fssizesTag(Header h, rpm_tagtype_t* type,
+static int fssizesTag(Header h, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
@@ -599,13 +599,13 @@ static int fssizesTag(Header h, rpm_tagtype_t* type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int triggercondsTag(Header h, rpm_tagtype_t* type,
+static int triggercondsTag(Header h, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     HFD_t hfd = headerFreeData;
-    rpm_tagtype_t tnt, tvt, tst;
+    rpmTagType tnt, tvt, tst;
     int32_t * indices;
     char ** names, ** versions;
     rpm_count_t numNames, numScripts;
@@ -673,13 +673,13 @@ static int triggercondsTag(Header h, rpm_tagtype_t* type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int triggertypeTag(Header h, rpm_tagtype_t* type,
+static int triggertypeTag(Header h, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     HFD_t hfd = headerFreeData;
-    rpm_tagtype_t tst;
+    rpmTagType tst;
     int32_t * indices;
     const char ** conds;
     const char ** s;
@@ -732,7 +732,7 @@ static int triggertypeTag(Header h, rpm_tagtype_t* type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int filenamesTag(Header h, rpm_tagtype_t* type,
+static int filenamesTag(Header h, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
@@ -751,7 +751,7 @@ static int filenamesTag(Header h, rpm_tagtype_t* type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int fileclassTag(Header h, rpm_tagtype_t* type,
+static int fileclassTag(Header h, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
@@ -770,7 +770,7 @@ static int fileclassTag(Header h, rpm_tagtype_t* type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int fileprovideTag(Header h, rpm_tagtype_t* type,
+static int fileprovideTag(Header h, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
@@ -789,7 +789,7 @@ static int fileprovideTag(Header h, rpm_tagtype_t* type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int filerequireTag(Header h, rpm_tagtype_t* type,
+static int filerequireTag(Header h, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
@@ -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, rpm_tagtype_t* type,
+static int i18nTag(Header h, rpm_tag_t tag, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
@@ -910,7 +910,7 @@ static int i18nTag(Header h, rpm_tag_t tag, rpm_tagtype_t* type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int summaryTag(Header h, rpm_tagtype_t* type,
+static int summaryTag(Header h, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
@@ -926,7 +926,7 @@ static int summaryTag(Header h, rpm_tagtype_t* type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int descriptionTag(Header h, rpm_tagtype_t* type,
+static int descriptionTag(Header h, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
@@ -942,7 +942,7 @@ static int descriptionTag(Header h, rpm_tagtype_t* type,
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
  */
-static int groupTag(Header h, rpm_tagtype_t* type,
+static int groupTag(Header h, rpmTagType* type,
 		rpm_data_t * data, rpm_count_t * count,
 		int * freeData)
 {
diff --git a/lib/idtx.c b/lib/idtx.c
index 9e6d2bf8c..f4391722b 100644
--- a/lib/idtx.c
+++ b/lib/idtx.c
@@ -79,7 +79,7 @@ IDTX IDTXload(rpmts ts, rpm_tag_t tag)
     (void) rpmdbSetIteratorRE(mi, RPMTAG_NAME, RPMMIRE_DEFAULT, '!gpg-pubkey');
 #endif
     while ((h = rpmdbNextIterator(mi)) != NULL) {
-	rpm_tagtype_t type = RPM_NULL_TYPE;
+	rpmTagType type = RPM_NULL_TYPE;
 	rpm_count_t count = 0;
 	rpm_tid_t * tidp;
 
@@ -128,7 +128,7 @@ IDTX IDTXglob(rpmts ts, const char * globstr, rpm_tag_t tag)
 
     if (xx == 0)
     for (i = 0; i < ac; i++) {
-	rpm_tagtype_t type;
+	rpmTagType type;
 	rpm_count_t count;
 	int isSource;
 
diff --git a/lib/legacy.c b/lib/legacy.c
index a2dc385c3..4f63b8358 100644
--- a/lib/legacy.c
+++ b/lib/legacy.c
@@ -35,7 +35,7 @@ void compressFilelist(Header h)
     const char ** dirNames;
     const char ** baseNames;
     uint32_t * dirIndexes;
-    rpm_tagtype_t fnt;
+    rpmTagType fnt;
     rpm_count_t count, i;
     int xx;
     int dirIndex = -1;
@@ -152,7 +152,7 @@ void providePackageNVR(Header h)
     rpmsenseFlags pFlags = RPMSENSE_EQUAL;
     const char ** provides = NULL;
     const char ** providesEVR = NULL;
-    rpm_tagtype_t pnt, pvt;
+    rpmTagType pnt, pvt;
     rpmsenseFlags * provideFlags = NULL;
     rpm_count_t providesCount, i;
     int xx;
diff --git a/lib/package.c b/lib/package.c
index 8ae7d339f..ce0129161 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -86,7 +86,7 @@ void headerMergeLegacySigs(Header h, const Header sigh)
     HFD_t hfd = (HFD_t) headerFreeData;
     HAE_t hae = (HAE_t) headerAddEntry;
     HeaderIterator hi;
-    rpm_tagtype_t type;
+    rpmTagType type;
     rpm_tag_t tag;
     rpm_count_t count;
     rpm_data_t ptr;
@@ -170,7 +170,7 @@ Header headerRegenSigHeader(const Header h, int noArchiveSize)
     HeaderIterator hi;
     rpm_count_t count;
     rpm_tag_t tag, stag;
-    rpm_tagtype_t type;
+    rpmTagType type;
     rpm_data_t ptr;
     int xx;
 
@@ -683,7 +683,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
     rpmlead l = NULL;
     Header sigh = NULL;
     rpm_tag_t sigtag;
-    rpm_tagtype_t sigtype;
+    rpmTagType sigtype;
     rpm_data_t sig;
     rpm_count_t siglen;
     rpmtsOpX opx;
@@ -824,7 +824,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
 	    goto exit;
 	}
     {	void * uh = NULL;
-	rpm_tagtype_t uht;
+	rpmTagType uht;
 	rpm_count_t uhc;
 
 	if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc))
@@ -851,7 +851,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
 	}
     case RPMSIGTAG_SHA1:
     {	void * uh = NULL;
-	rpm_tagtype_t uht;
+	rpmTagType uht;
 	rpm_count_t uhc;
 
 	if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc))
diff --git a/lib/psm.c b/lib/psm.c
index 2e0ddc3b4..a021e8c11 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -134,7 +134,7 @@ const char ** argv;
 	int32_t * i32p;
     } body;
     char numbuf[32];
-    rpm_tagtype_t type;
+    rpmTagType type;
 
     for (tagm = tagMacros; tagm->macroname != NULL; tagm++) {
 	if (!hge(h, tagm->tag, &type, (rpm_data_t *) &body, NULL))
@@ -615,7 +615,7 @@ static rpmRC runScript(rpmpsm psm, Header h, rpm_tag_t stag,
     int argc = 0;
     const char ** prefixes = NULL;
     rpm_count_t numPrefixes;
-    rpm_tagtype_t ipt;
+    rpmTagType ipt;
     const char * oldPrefix;
     size_t maxPrefixLength;
     size_t len;
@@ -909,7 +909,7 @@ static rpmRC runInstScript(rpmpsm psm)
     rpm_data_t * progArgv;
     rpm_count_t progArgc;
     const char ** argv;
-    rpm_tagtype_t ptt, stt;
+    rpmTagType ptt, stt;
     char * script;
     rpmRC rc = RPMRC_OK;
     int xx;
@@ -979,7 +979,7 @@ static rpmRC handleOneTrigger(const rpmpsm psm,
     (void) rpmdsSetNoPromote(trigger, 1);
 
     while ((i = rpmdsNext(trigger)) >= 0) {
-	rpm_tagtype_t tit, tst, tpt;
+	rpmTagType tit, tst, tpt;
 	const char * Name;
 	rpmsenseFlags Flags = rpmdsFlags(trigger);
 
@@ -1096,7 +1096,7 @@ static rpmRC runImmedTriggers(rpmpsm psm)
     const char ** triggerNames;
     rpm_count_t numTriggers, numTriggerIndices;
     rpm_count_t * triggerIndices;
-    rpm_tagtype_t tnt, tit;
+    rpmTagType tnt, tit;
     unsigned char * triggersRun;
     rpmRC rc = RPMRC_OK;
 
@@ -1517,7 +1517,7 @@ assert(psm->mi == NULL);
 
 	    /* Regenerate original header. */
 	    {	void * uh = NULL;
-		rpm_tagtype_t uht;
+		rpmTagType uht;
 		rpm_count_t uhc;
 
 		if (headerGetEntry(fi->h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)) {
@@ -1527,7 +1527,7 @@ assert(psm->mi == NULL);
 		if (headerGetEntry(fi->h, RPMTAG_HEADERIMAGE, &uht, &uh, &uhc))
 		{
 		    HeaderIterator hi;
-		    rpm_tagtype_t type;
+		    rpmTagType type;
 		    rpm_tag_t tag;
 		    rpm_count_t count;
 		    rpm_data_t ptr;
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 61cfaa6c5..4db6d9fe4 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -111,7 +111,7 @@ exit:
 static int getSignid(Header sig, rpm_tag_t sigtag, pgpKeyID_t signid)
 {
     rpm_data_t pkt = NULL;
-    rpm_tagtype_t pkttyp = 0;
+    rpmTagType pkttyp = 0;
     rpm_count_t pktlen = 0;
     int rc = 1;
 
@@ -149,7 +149,7 @@ static int rpmReSign(rpmts ts,
     Header sigh = NULL;
     char * msg;
     void * uh = NULL;
-    rpm_tagtype_t uht;
+    rpmTagType uht;
     rpm_count_t uhc;
     int res = EXIT_FAILURE;
     int deleting = (qva->qva_mode == RPMSIGN_DEL_SIGNATURE);
@@ -210,7 +210,7 @@ static int rpmReSign(rpmts ts,
 	/* Dump the immutable region (if present). */
 	if (headerGetEntry(sigh, RPMTAG_HEADERSIGNATURES, &uht, &uh, &uhc)) {
 	    HeaderIterator hi;
-	    rpm_tagtype_t type;
+	    rpmTagType type;
 	    rpm_tag_t tag;
 	    rpm_count_t count;
 	    rpm_data_t ptr;
@@ -470,7 +470,7 @@ static int readFile(FD_t fd, const char * fn, pgpDig dig)
 
 	if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
 	    void * uh;
-	    rpm_tagtype_t uht;
+	    rpmTagType uht;
 	    rpm_count_t uhc;
 	
 	    if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)
@@ -515,7 +515,7 @@ int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd,
     char missingKeys[7164], * m;
     char untrustedKeys[7164], * u;
     rpm_tag_t sigtag;
-    rpm_tagtype_t sigtype;
+    rpmTagType sigtype;
     rpm_data_t sig;
     pgpDig dig;
     pgpDigParams sigp;
diff --git a/lib/rpmds.c b/lib/rpmds.c
index e6a3afeda..e458cd468 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -36,7 +36,7 @@ struct rpmds_s {
     int32_t * Refs;		/*!< No. of file refs. */
     time_t BT;			/*!< Package build time tie breaker. */
     rpm_tag_t tagN;		/*!< Header tag. */
-    rpm_tagtype_t Nt, EVRt, Ft;	/*!< Tag data types. */
+    rpmTagType Nt, EVRt, Ft;	/*!< Tag data types. */
     int32_t Count;		/*!< No. of elements */
     int i;			/*!< Element index. */
     unsigned l;			/*!< Low element (bsearch). */
@@ -142,13 +142,13 @@ rpmds rpmdsNew(Header h, rpm_tag_t tagN, int flags)
     HGE_t hge =
 	(scareMem ? (HGE_t) headerGetEntryMinMemory : (HGE_t) headerGetEntry);
     rpm_tag_t tagBT = RPMTAG_BUILDTIME;
-    rpm_tagtype_t BTt;
+    rpmTagType BTt;
     rpm_time_t * BTp;
     rpm_tag_t tagEVR, tagF;
     rpmds ds = NULL;
     const char * Type;
     const char ** N;
-    rpm_tagtype_t Nt;
+    rpmTagType Nt;
     rpm_count_t Count;
 
     if (dsType(tagN, &Type, &tagEVR, &tagF))
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 623dd861e..a5ac61671 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -627,7 +627,7 @@ Header relocateFileList(const rpmts ts, rpmfi fi,
     rpmRelocation * relocations = NULL;
     int numRelocations;
     const char ** validRelocations;
-    rpm_tagtype_t validType;
+    rpmTagType validType;
     const char ** baseNames;
     const char ** dirNames;
     uint32_t * dirIndexes;
@@ -995,7 +995,7 @@ dColors[j] |= fColors[i];
     if (nrelocated) {
 	rpm_count_t c;
 	void * d;
-	rpm_tagtype_t t;
+	rpmTagType t;
 
 	d = NULL;
 	xx = hge(h, RPMTAG_BASENAMES, &t, &d, &c);
@@ -1492,7 +1492,7 @@ void rpmfiBuildFNames(Header h, rpm_tag_t tagN,
     int size;
     rpm_tag_t dirNameTag = 0;
     rpm_tag_t dirIndexesTag = 0;
-    rpm_tagtype_t bnt, dnt;
+    rpmTagType bnt, dnt;
     char * t;
     int i, xx;
 
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 8340cc09c..d08e896e3 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -477,7 +477,7 @@ if (fileURL[0] == '=') {
 
 	if (eiu->relocations) {
 	    const char ** paths;
-	    rpm_tagtype_t pft;
+	    rpmTagType pft;
 	    rpm_count_t c;
 
 	    if (headerGetEntry(eiu->h, RPMTAG_PREFIXES, &pft,
diff --git a/lib/rpmtag.h b/lib/rpmtag.h
index a7c4333aa..4a85fe1af 100644
--- a/lib/rpmtag.h
+++ b/lib/rpmtag.h
@@ -308,9 +308,9 @@ typedef enum rpmTagType_e {
     RPM_BIN_TYPE		=  7,
     RPM_STRING_ARRAY_TYPE	=  8,
     RPM_I18NSTRING_TYPE		=  9,
-    RPM_MASK_TYPE               =  0x0000ffff
 #define	RPM_MAX_TYPE		9
 #define RPM_FORCEFREE_TYPE	0xff
+#define RPM_MASK_TYPE		0x0000ffff
 } rpmTagType;
 
 /** \ingroup header
diff --git a/lib/rpmts.c b/lib/rpmts.c
index fdecf1b0a..6e71fcd66 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -296,7 +296,7 @@ fprintf(stderr, "*** free pkt %p[%d] id %08x %08x\n", ts->pkpkt, ts->pkpktlen, p
 	mi = rpmtsInitIterator(ts, RPMTAG_PUBKEYS, sigp->signid, sizeof(sigp->signid));
 	while ((h = rpmdbNextIterator(mi)) != NULL) {
 	    const char ** pubkeys;
-	    rpm_tagtype_t pt;
+	    rpmTagType pt;
 	    rpm_count_t pc;
 
 	    if (!headerGetEntry(h, RPMTAG_PUBKEYS, &pt, (rpm_data_t *)&pubkeys, &pc))
@@ -1148,9 +1148,9 @@ rpm_tag_t rpmtsSigtag(const rpmts ts)
     return sigtag;
 }
 
-rpm_tagtype_t rpmtsSigtype(const rpmts ts)
+rpmTagType rpmtsSigtype(const rpmts ts)
 {
-    rpm_tagtype_t sigtype = 0;
+    rpmTagType sigtype = 0;
     if (ts != NULL)
 	sigtype = ts->sigtype;
     return sigtype;
@@ -1172,7 +1172,7 @@ size_t rpmtsSiglen(const rpmts ts)
     return siglen;
 }
 
-int rpmtsSetSig(rpmts ts, rpm_tag_t sigtag, rpm_tagtype_t sigtype, 
+int rpmtsSetSig(rpmts ts, rpm_tag_t sigtag, rpmTagType sigtype, 
 		rpm_data_t sig, size_t siglen)
 {
     if (ts != NULL) {
diff --git a/lib/rpmts.h b/lib/rpmts.h
index 8b086198d..390bcf1c9 100644
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -529,7 +529,7 @@ rpm_tag_t rpmtsSigtag(const rpmts ts);
  * @param ts		transaction set
  * @return		signature tag type
  */
-rpm_tagtype_t rpmtsSigtype(const rpmts ts);
+rpmTagType rpmtsSigtype(const rpmts ts);
 
 /** \ingroup rpmts
  * Get signature tag data, i.e. from header.
@@ -555,7 +555,7 @@ size_t rpmtsSiglen(const rpmts ts);
  * @return		0 always
  */
 int rpmtsSetSig(rpmts ts,
-		rpm_tag_t sigtag, rpm_tagtype_t sigtype,
+		rpm_tag_t sigtag, rpmTagType sigtype,
 		rpm_data_t sig, size_t siglen);
 
 /** \ingroup rpmts
diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.h
index c8d47ad0c..ca2227023 100644
--- a/lib/rpmts_internal.h
+++ b/lib/rpmts_internal.h
@@ -99,7 +99,7 @@ struct rpmts_s {
 
     const char * fn;		/*!< Current package fn. */
     rpm_tag_t  sigtag;		/*!< Current package signature tag. */
-    rpm_tagtype_t  sigtype;	/*!< Current package signature data type. */
+    rpmTagType  sigtype;	/*!< Current package signature data type. */
     rpm_data_t sig;		/*!< Current package signature. */
     size_t siglen;		/*!< Current package signature length. */
 
diff --git a/lib/rpmtypes.h b/lib/rpmtypes.h
index 499d0424c..175e1e914 100644
--- a/lib/rpmtypes.h
+++ b/lib/rpmtypes.h
@@ -26,7 +26,7 @@ typedef struct headerToken_s * Header;
 typedef struct headerIterator_s * HeaderIterator;
 
 typedef int32_t		rpm_tag_t;
-typedef uint32_t	rpm_tagtype_t;
+typedef uint32_t	rpm_tagtype_t; 		/* unused */
 typedef uint32_t	rpm_count_t;
 
 typedef void *		rpm_data_t;
diff --git a/lib/signature.c b/lib/signature.c
index 92fdc2a6b..df267d583 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -639,7 +639,7 @@ static int makeHDRSignature(Header sigh, const char * file, rpm_tag_t sigTag,
 	if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
 	    DIGEST_CTX ctx;
 	    void * uh;
-	    rpm_tagtype_t uht;
+	    rpmTagType uht;
 	    rpm_count_t uhc;
 	
 	    if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)