Eliminate unused spec argument from addReqProv()

- addReqProv() only operates on the header, not spec

diff --git a/build/parseReqs.c b/build/parseReqs.c
index 29db65b..014db78 100644 (file)
--- a/build/parseReqs.c
+++ b/build/parseReqs.c
@@ -173,7 +173,7 @@ rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTag tagN,
        } else
            EVR = NULL;
 
-       if (addReqProv(spec, h, nametag, N, EVR, Flags, index)) {
+       if (addReqProv(h, nametag, N, EVR, Flags, index)) {
            rpmlog(RPMLOG_ERR, _("line %d: invalid dependency: %s\n"),
                   spec->lineNum, spec->line);
            goto exit;

diff --git a/build/parseScript.c b/build/parseScript.c
index 0948ba9..0368fc5 100644 (file)
--- a/build/parseScript.c
+++ b/build/parseScript.c
@@ -304,7 +304,7 @@ int parseScript(rpmSpec spec, int parsePart)
                 spec->lineNum, progArgv[0]);
        goto exit;
     } else {
-        (void) addReqProv(spec, pkg->header, RPMTAG_REQUIRENAME,
+        (void) addReqProv(pkg->header, RPMTAG_REQUIRENAME,
                progArgv[0], NULL, (tagflags | RPMSENSE_INTERP), 0);
     }
 

diff --git a/build/reqprov.c b/build/reqprov.c
index 1dd43e4..a0d1c87 100644 (file)
--- a/build/reqprov.c
+++ b/build/reqprov.c
@@ -41,7 +41,7 @@ static int isNewDep(Header h, rpmTag nametag,
     return new;
 }
 
-int addReqProv(rpmSpec spec, Header h, rpmTag tagN,
+int addReqProv(Header h, rpmTag tagN,
                const char * N, const char * EVR, rpmsenseFlags Flags,
                uint32_t index)
 {
@@ -109,8 +109,7 @@ int rpmlibNeedsFeature(Header h, const char * feature, const char * featureEVR)
 
     rasprintf(&reqname, "rpmlib(%s)", feature);
 
-    /* XXX 1st arg is unused */
-    res = addReqProv(NULL, h, RPMTAG_REQUIRENAME, reqname, featureEVR,
+    res = addReqProv(h, RPMTAG_REQUIRENAME, reqname, featureEVR,
                     RPMSENSE_RPMLIB|(RPMSENSE_LESS|RPMSENSE_EQUAL), 0);
 
     free(reqname);

diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index dd4c84f..21ea0de 100644 (file)
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -285,7 +285,6 @@ Package newPackage(rpmSpec spec);
 
 /** \ingroup rpmbuild
  * Add dependency to header, filtering duplicates.
- * @param spec         spec file control structure
  * @param h            header
  * @param tagN         tag, identifies type of dependency
  * @param N            (e.g. Requires: foo < 0:1.2-3, "foo")
@@ -294,7 +293,7 @@ Package newPackage(rpmSpec spec);
  * @param index                (0 always)
  * @return             0 on success, 1 on error
  */
-int addReqProv(rpmSpec spec, Header h, rpmTag tagN,
+int addReqProv(Header h, rpmTag tagN,
                const char * N, const char * EVR, rpmsenseFlags Flags,
                uint32_t index);