summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2010-03-06 11:04:48 +0200
committerPanu Matilainen <pmatilai@redhat.com>2010-03-06 11:04:48 +0200
commit4878580634971b31befe1741ba83b5ffca0dcf15 (patch)
treea92f1c2874f68678a3b14fc25ac7d899c11656c2 /build
parent1ab5fa94e30d0aa98c8482d9c19f11e759de2531 (diff)
downloadrpm-4878580634971b31befe1741ba83b5ffca0dcf15.tar.gz
rpm-4878580634971b31befe1741ba83b5ffca0dcf15.tar.bz2
rpm-4878580634971b31befe1741ba83b5ffca0dcf15.zip
Lose a couple of leftover variables from times before headerPutString()
Diffstat (limited to 'build')
-rw-r--r--build/rpmfc.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/build/rpmfc.c b/build/rpmfc.c
index 38b6e3152..29f58d1b6 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1270,12 +1270,10 @@ rpmRC rpmfcGenerateDepends(const rpmSpec spec, Package pkg)
if (fc->provides != NULL && rpmdsCount(fc->provides) > 0 && !fc->skipProv) {
rpmds pi = rpmdsInit(fc->provides);
while (rpmdsNext(pi) >= 0) {
- const char *name = rpmdsN(pi);
- const char *evr = rpmdsEVR(pi);
rpmsenseFlags flags = rpmdsFlags(pi);
- headerPutString(pkg->header, RPMTAG_PROVIDENAME, name);
- headerPutString(pkg->header, RPMTAG_PROVIDEVERSION, evr);
+ headerPutString(pkg->header, RPMTAG_PROVIDENAME, rpmdsN(pi));
+ headerPutString(pkg->header, RPMTAG_PROVIDEVERSION, rpmdsEVR(pi));
headerPutUint32(pkg->header, RPMTAG_PROVIDEFLAGS, &flags, 1);
}
}
@@ -1284,12 +1282,10 @@ rpmRC rpmfcGenerateDepends(const rpmSpec spec, Package pkg)
if (fc->requires != NULL && rpmdsCount(fc->requires) > 0 && !fc->skipReq) {
rpmds pi = rpmdsInit(fc->requires);
while (rpmdsNext(pi) >= 0) {
- const char *name = rpmdsN(pi);
- const char *evr = rpmdsEVR(pi);
rpmsenseFlags flags = rpmdsFlags(pi);
- headerPutString(pkg->header, RPMTAG_REQUIRENAME, name);
- headerPutString(pkg->header, RPMTAG_REQUIREVERSION, evr);
+ headerPutString(pkg->header, RPMTAG_REQUIRENAME, rpmdsN(pi));
+ headerPutString(pkg->header, RPMTAG_REQUIREVERSION, rpmdsEVR(pi));
headerPutUint32(pkg->header, RPMTAG_REQUIREFLAGS, &flags, 1);
}
}