Switch psm and rpmscript to use rpmTagVal where appropriate

- There are a few true rpmTag uses though, leaving them as they are...

diff --git a/lib/psm.c b/lib/psm.c
index 651dbb8..0f7d9df 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -58,7 +58,7 @@ typedef struct rpmpsm_s {
     rpmfi fi;                  /*!< transaction element file info */
     const char * goalName;
     char * failedFile;
-    rpmTag scriptTag;          /*!< Scriptlet data tag. */
+    rpmTagVal scriptTag;       /*!< Scriptlet data tag. */
     int npkgs_installed;       /*!< No. of installed instances. */
     int scriptArg;             /*!< Scriptlet package arg. */
     rpmsenseFlags sense;       /*!< One of RPMSENSE_TRIGGER{PREIN,IN,UN,POSTUN}. */
@@ -369,9 +369,9 @@ exit:
     return rpmrc;
 }
 
-static rpmTag triggertag(rpmsenseFlags sense) 
+static rpmTagVal triggertag(rpmsenseFlags sense) 
 {
-    rpmTag tag = RPMTAG_NOT_FOUND;
+    rpmTagVal tag = RPMTAG_NOT_FOUND;
     switch (sense) {
     case RPMSENSE_TRIGGERIN:
        tag = RPMTAG_TRIGGERIN;

diff --git a/lib/rpmscript.c b/lib/rpmscript.c
index 0d79e85..6a05a1a 100644 (file)
--- a/lib/rpmscript.c
+++ b/lib/rpmscript.c
@@ -295,7 +295,7 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd,
     return rc;
 }
 
-static rpmTag getProgTag(rpmTag scriptTag)
+static rpmTagVal getProgTag(rpmTagVal scriptTag)
 {
     switch (scriptTag) {
     case RPMTAG_PREIN:         return RPMTAG_PREINPROG;
@@ -309,7 +309,7 @@ static rpmTag getProgTag(rpmTag scriptTag)
     }
 }
 
-static rpmTag getFlagTag(rpmTag scriptTag)
+static rpmTagVal getFlagTag(rpmTagVal scriptTag)
 {
     switch (scriptTag) {
     case RPMTAG_PRETRANS:      return RPMTAG_PRETRANSFLAGS;
@@ -326,7 +326,7 @@ static rpmTag getFlagTag(rpmTag scriptTag)
     return RPMTAG_NOT_FOUND;
 }
 
-static const char * tag2sln(rpmTag tag)
+static const char * tag2sln(rpmTagVal tag)
 {
     switch (tag) {
     case RPMTAG_PRETRANS:       return "%pretrans";
@@ -345,10 +345,10 @@ static const char * tag2sln(rpmTag tag)
     return "%unknownscript";
 }
 
-rpmScript rpmScriptFromTag(Header h, rpmTag scriptTag)
+rpmScript rpmScriptFromTag(Header h, rpmTagVal scriptTag)
 {
     rpmScript script = NULL;
-    rpmTag progTag = getProgTag(scriptTag);
+    rpmTagVal progTag = getProgTag(scriptTag);
 
     if (headerIsEntry(h, scriptTag) || headerIsEntry(h, progTag)) {
        struct rpmtd_s prog;

diff --git a/lib/rpmscript.h b/lib/rpmscript.h
index 9c340df..f10770c 100644 (file)
--- a/lib/rpmscript.h
+++ b/lib/rpmscript.h
@@ -15,7 +15,7 @@ typedef rpmFlags rpmscriptFlags;
 typedef struct rpmScript_s * rpmScript;
 
 struct rpmScript_s {
-    rpmTag tag;                /* script tag */
+    rpmTagVal tag;     /* script tag */
     char **args;       /* scriptlet call arguments */
     char *body;                /* script body */
     char *descr;       /* description for logging */
@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 RPM_GNUC_INTERNAL
-rpmScript rpmScriptFromTag(Header h, rpmTag scriptTag);
+rpmScript rpmScriptFromTag(Header h, rpmTagVal scriptTag);
 
 RPM_GNUC_INTERNAL
 rpmScript rpmScriptFree(rpmScript script);