Change all the legacy interfaces to use the "concrete" integer tag types

- More compatible with the 4.4.x definitions (should've been this way
  all this time) and none of these are "true" enum uses anyway

2 files changed, 39 insertions, 39 deletions

diff --git a/lib/legacy.c b/lib/legacy.c
index 9a065dc92..9765d271d 100644
--- a/lib/legacy.c
+++ b/lib/legacy.c
@@ -249,12 +249,12 @@ int headerConvert(Header h, headerConvOps op)
     if (c) \
 	*c = td.count
 
-int headerRemoveEntry(Header h, rpmTag tag)
+int headerRemoveEntry(Header h, rpm_tag_t tag)
 {
     return headerDel(h, tag);
 }
 
-static void *_headerFreeData(rpm_data_t data, rpmTagType type)
+static void *_headerFreeData(rpm_data_t data, rpm_tagtype_t type)
 {
     if (data) {
 	if (type == RPM_FORCEFREE_TYPE ||
@@ -266,18 +266,18 @@ static void *_headerFreeData(rpm_data_t data, rpmTagType type)
     return NULL;
 }
 
-void * headerFreeData(rpm_data_t data, rpmTagType type)
+void * headerFreeData(rpm_data_t data, rpm_tagtype_t type)
 {
     return _headerFreeData(data, type);
 }
 
-void * headerFreeTag(Header h, rpm_data_t data, rpmTagType type)
+void * headerFreeTag(Header h, rpm_data_t data, rpm_tagtype_t type)
 {
     return _headerFreeData(data, type);
 }
 
-static int headerGetWrap(Header h, rpmTag tag,
-		rpmTagType * type,
+static int headerGetWrap(Header h, rpm_tag_t tag,
+		rpm_tagtype_t * type,
 		rpm_data_t * p,
 		rpm_count_t * c,
 		headerGetFlags flags)
@@ -290,16 +290,16 @@ static int headerGetWrap(Header h, rpmTag tag,
     return rc;
 }
 
-int headerGetEntry(Header h, rpmTag tag,
-			rpmTagType * type,
+int headerGetEntry(Header h, rpm_tag_t tag,
+			rpm_tagtype_t * type,
 			rpm_data_t * p,
 			rpm_count_t * c)
 {
     return headerGetWrap(h, tag, type, p, c, HEADERGET_DEFAULT);
 }
 
-int headerGetEntryMinMemory(Header h, rpmTag tag,
-			rpmTagType * type,
+int headerGetEntryMinMemory(Header h, rpm_tag_t tag,
+			rpm_tagtype_t * type,
 			rpm_data_t * p,
 			rpm_count_t * c)
 {
@@ -307,10 +307,10 @@ int headerGetEntryMinMemory(Header h, rpmTag tag,
 }
 
 /* XXX shut up compiler warning from missing prototype */
-int headerGetRawEntry(Header h, rpmTag tag, rpmTagType * type, rpm_data_t * p,
+int headerGetRawEntry(Header h, rpm_tag_t tag, rpm_tagtype_t * type, rpm_data_t * p,
 		rpm_count_t * c);
 
-int headerGetRawEntry(Header h, rpmTag tag, rpmTagType * type, rpm_data_t * p,
+int headerGetRawEntry(Header h, rpm_tag_t tag, rpm_tagtype_t * type, rpm_data_t * p,
 		rpm_count_t * c)
 {
     if (p == NULL) 
@@ -320,8 +320,8 @@ int headerGetRawEntry(Header h, rpmTag tag, rpmTagType * type, rpm_data_t * p,
 }
 
 int headerNextIterator(HeaderIterator hi,
-		rpmTag * tag,
-		rpmTagType * type,
+		rpm_tag_t * tag,
+		rpm_tagtype_t * type,
 		rpm_data_t * p,
 		rpm_count_t * c)
 {
@@ -335,7 +335,7 @@ int headerNextIterator(HeaderIterator hi,
     return rc;
 }
 
-int headerModifyEntry(Header h, rpmTag tag, rpmTagType type,
+int headerModifyEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
 			rpm_constdata_t p, rpm_count_t c)
 {
     struct rpmtd_s td = {
@@ -347,7 +347,7 @@ int headerModifyEntry(Header h, rpmTag tag, rpmTagType type,
     return headerMod(h, &td);
 }
 
-static int headerPutWrap(Header h, rpmTag tag, rpmTagType type,
+static int headerPutWrap(Header h, rpm_tag_t tag, rpm_tagtype_t type,
 		rpm_constdata_t p, rpm_count_t c, headerPutFlags flags)
 {
     struct rpmtd_s td = {
@@ -359,19 +359,19 @@ static int headerPutWrap(Header h, rpmTag tag, rpmTagType type,
     return headerPut(h, &td, flags);
 }
 
-int headerAddOrAppendEntry(Header h, rpmTag tag, rpmTagType type,
+int headerAddOrAppendEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
 		rpm_constdata_t p, rpm_count_t c)
 {
     return headerPutWrap(h, tag, type, p, c, HEADERPUT_APPEND);
 }
 
-int headerAppendEntry(Header h, rpmTag tag, rpmTagType type,
+int headerAppendEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
 		rpm_constdata_t p, rpm_count_t c)
 {
     return headerPutWrap(h, tag, type, p, c, HEADERPUT_APPEND);
 }
 
-int headerAddEntry(Header h, rpmTag tag, rpmTagType type,
+int headerAddEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
 		rpm_constdata_t p, rpm_count_t c)
 {
     return headerPutWrap(h, tag, type, p, c, HEADERPUT_DEFAULT);
diff --git a/lib/rpmlegacy.h b/lib/rpmlegacy.h
index 2324e37fe..2f9e0a03e 100644
--- a/lib/rpmlegacy.h
+++ b/lib/rpmlegacy.h
@@ -22,8 +22,8 @@ typedef uint32_t	uint_32 RPM_GNUC_DEPRECATED;
 typedef uint16_t	uint_16 RPM_GNUC_DEPRECATED;
 typedef uint8_t		uint_8 RPM_GNUC_DEPRECATED;
 
-typedef rpmTag *	hTAG_t RPM_GNUC_DEPRECATED;
-typedef rpmTagType *	hTYP_t RPM_GNUC_DEPRECATED;
+typedef rpm_tag_t *	hTAG_t RPM_GNUC_DEPRECATED;
+typedef rpm_tagtype_t *	hTYP_t RPM_GNUC_DEPRECATED;
 typedef const void *	hPTR_t RPM_GNUC_DEPRECATED;
 typedef rpm_count_t *	hCNT_t RPM_GNUC_DEPRECATED;
 
@@ -45,8 +45,8 @@ typedef rpmSpec		Spec RPM_GNUC_DEPRECATED;
  * @retval *c		number of values (or NULL)
  * @return		1 on success, 0 on failure
  */
-int headerGetEntry(Header h, rpmTag tag,
-			rpmTagType * type,
+int headerGetEntry(Header h, rpm_tag_t tag,
+			rpm_tagtype_t * type,
 			rpm_data_t * p,
 			rpm_count_t * c) RPM_GNUC_DEPRECATED;
 
@@ -63,8 +63,8 @@ int headerGetEntry(Header h, rpmTag tag,
  * @retval *c		number of values (or NULL)
  * @return		1 on success, 0 on failure
  */
-int headerGetEntryMinMemory(Header h, rpmTag tag,
-			rpmTagType * type,
+int headerGetEntryMinMemory(Header h, rpm_tag_t tag,
+			rpm_tagtype_t * type,
 			rpm_data_t * p, 
 			rpm_count_t * c) RPM_GNUC_DEPRECATED;
 
@@ -82,7 +82,7 @@ int headerGetEntryMinMemory(Header h, rpmTag tag,
  * @param c		number of values
  * @return		1 on success, 0 on failure
  */
-int headerAddEntry(Header h, rpmTag tag, rpmTagType type, 
+int headerAddEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type, 
 		   rpm_constdata_t p, rpm_count_t c) RPM_GNUC_DEPRECATED;
 
 /** \ingroup header_legacy
@@ -99,7 +99,7 @@ int headerAddEntry(Header h, rpmTag tag, rpmTagType type,
  * @param c		number of values
  * @return		1 on success, 0 on failure
  */
-int headerAppendEntry(Header h, rpmTag tag, rpmTagType type,
+int headerAppendEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
 		rpm_constdata_t p, rpm_count_t c) RPM_GNUC_DEPRECATED;
 
 /** \ingroup header_legacy
@@ -111,7 +111,7 @@ int headerAppendEntry(Header h, rpmTag tag, rpmTagType type,
  * @param c		number of values
  * @return		1 on success, 0 on failure
  */
-int headerAddOrAppendEntry(Header h, rpmTag tag, rpmTagType type,
+int headerAddOrAppendEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
 		rpm_constdata_t p, rpm_count_t c) RPM_GNUC_DEPRECATED;
 
 /** \ingroup header_legacy
@@ -126,7 +126,7 @@ int headerAddOrAppendEntry(Header h, rpmTag tag, rpmTagType type,
  * @param c		number of values
  * @return		1 on success, 0 on failure
  */
-int headerModifyEntry(Header h, rpmTag tag, rpmTagType type,
+int headerModifyEntry(Header h, rpm_tag_t tag, rpm_tagtype_t type,
 			rpm_constdata_t p, rpm_count_t c) RPM_GNUC_DEPRECATED;
 
 /** \ingroup header_legacy
@@ -139,7 +139,7 @@ int headerModifyEntry(Header h, rpmTag tag, rpmTagType type,
  * @param tag		tag
  * @return		0 on success, 1 on failure (INCONSISTENT)
  */
-int headerRemoveEntry(Header h, rpmTag tag) RPM_GNUC_DEPRECATED;
+int headerRemoveEntry(Header h, rpm_tag_t tag) RPM_GNUC_DEPRECATED;
 
 /** \ingroup header_legacy
  * Return formatted output string from header tags.
@@ -168,8 +168,8 @@ int headerRemoveEntry(Header h, rpmTag tag) RPM_GNUC_DEPRECATED;
  * @return		1 on success, 0 on failure
  */
 int headerNextIterator(HeaderIterator hi,
-		rpmTag * tag,
-		rpmTagType * type,
+		rpm_tag_t * tag,
+		rpm_tagtype_t * type,
 		rpm_data_t * p,
 		rpm_count_t * c) RPM_GNUC_DEPRECATED;
 
@@ -182,7 +182,7 @@ int headerNextIterator(HeaderIterator hi,
  * @param type		type of data (or -1 to force free)
  * @return		NULL always
  */
-void * headerFreeTag(Header h, rpm_data_t data, rpmTagType type) RPM_GNUC_DEPRECATED;
+void * headerFreeTag(Header h, rpm_data_t data, rpm_tagtype_t type) RPM_GNUC_DEPRECATED;
 
 /** \ingroup header_legacy
  * Free data allocated when retrieved from header.
@@ -192,20 +192,20 @@ void * headerFreeTag(Header h, rpm_data_t data, rpmTagType type) RPM_GNUC_DEPREC
  * @param type		type of data (or RPM_FORCEFREE_TYPE to force free)
  * @return		NULL always
  */
-void * headerFreeData(rpm_data_t data, rpmTagType type) RPM_GNUC_DEPRECATED;
+void * headerFreeData(rpm_data_t data, rpm_tagtype_t type) RPM_GNUC_DEPRECATED;
 
 /** \ingroup header_legacy
  * Prototypes for headerGetEntry(), headerFreeData() etc vectors.
  * @{
  */
-typedef void * (*HFD_t) (rpm_data_t data, rpmTagType type) RPM_GNUC_DEPRECATED;
-typedef int (*HGE_t) (Header h, rpmTag tag, rpmTagType * type,
+typedef void * (*HFD_t) (rpm_data_t data, rpm_tagtype_t type) RPM_GNUC_DEPRECATED;
+typedef int (*HGE_t) (Header h, rpm_tag_t tag, rpm_tagtype_t * type,
 			rpm_data_t * p, rpm_count_t * c) RPM_GNUC_DEPRECATED;
-typedef int (*HAE_t) (Header h, rpmTag tag, rpmTagType type,
+typedef int (*HAE_t) (Header h, rpm_tag_t tag, rpm_tagtype_t type,
 			rpm_constdata_t p, rpm_count_t c) RPM_GNUC_DEPRECATED;
-typedef int (*HME_t) (Header h, rpmTag tag, rpmTagType type,
+typedef int (*HME_t) (Header h, rpm_tag_t tag, rpm_tagtype_t type,
 			rpm_constdata_t p, rpm_count_t c) RPM_GNUC_DEPRECATED;
-typedef int (*HRE_t) (Header h, rpmTag tag) RPM_GNUC_DEPRECATED;
+typedef int (*HRE_t) (Header h, rpm_tag_t tag) RPM_GNUC_DEPRECATED;
 /** @} */
 
 /* other misc renamed / namespaced functions */