From 6c91bf043776319bc0b78852ecf65a56501c60e1 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 30 Oct 2008 14:03:34 +0200
Subject: [PATCH] Remove unnecessary scaremem flags, hardwired to no scaremem
 anyway - no functional changes

---
 build/rpmfc.c | 8 +++-----
 lib/rpmds.c   | 3 +--
 lib/rpmte.c   | 9 ++++-----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/build/rpmfc.c b/build/rpmfc.c
index b28a46e..c3bb9d5 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1390,7 +1390,6 @@ static void printDeps(Header h)
 {
     DepMsg_t dm;
     rpmds ds = NULL;
-    int flags = 0;	/* XXX !scareMem */
     const char * DNEVR;
     rpmsenseFlags Flags;
     int bingo = 0;
@@ -1398,7 +1397,7 @@ static void printDeps(Header h)
     for (dm = DepMsgs; dm->msg != NULL; dm++) {
 	if (dm->ntag != -1) {
 	    ds = rpmdsFree(ds);
-	    ds = rpmdsNew(h, dm->ntag, flags);
+	    ds = rpmdsNew(h, dm->ntag, 0);
 	}
 	if (dm->ftag == 0)
 	    continue;
@@ -1510,7 +1509,6 @@ rpmRC rpmfcGenerateDepends(const rpmSpec spec, Package pkg)
     rpmfi fi = pkg->cpioList;
     rpmfc fc = NULL;
     rpmds ds;
-    int flags = 0;	/* XXX !scareMem */
     ARGV_t av;
     rpm_mode_t * fmode;
     int ac = rpmfiFC(fi);
@@ -1567,7 +1565,7 @@ rpmRC rpmfcGenerateDepends(const rpmSpec spec, Package pkg)
 
     /* Copy (and delete) manually generated dependencies to dictionary. */
     if (!fc->skipProv) {
-	ds = rpmdsNew(pkg->header, RPMTAG_PROVIDENAME, flags);
+	ds = rpmdsNew(pkg->header, RPMTAG_PROVIDENAME, 0);
 	xx = rpmdsMerge(&fc->provides, ds);
 	ds = rpmdsFree(ds);
 	xx = headerDel(pkg->header, RPMTAG_PROVIDENAME);
@@ -1598,7 +1596,7 @@ rpmRC rpmfcGenerateDepends(const rpmSpec spec, Package pkg)
     }
 
     if (!fc->skipReq) {
-	ds = rpmdsNew(pkg->header, RPMTAG_REQUIRENAME, flags);
+	ds = rpmdsNew(pkg->header, RPMTAG_REQUIRENAME, 0);
 	xx = rpmdsMerge(&fc->requires, ds);
 	ds = rpmdsFree(ds);
 	xx = headerDel(pkg->header, RPMTAG_REQUIRENAME);
diff --git a/lib/rpmds.c b/lib/rpmds.c
index 14c5aa5..66b5e71 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -907,7 +907,6 @@ void rpmdsProblem(rpmps ps, const char * pkgNEVR, const rpmds ds,
 
 int rpmdsAnyMatchesDep (const Header h, const rpmds req, int nopromote)
 {
-    int scareMem = 0;
     rpmds provides = NULL;
     int result = 0;
 
@@ -919,7 +918,7 @@ int rpmdsAnyMatchesDep (const Header h, const rpmds req, int nopromote)
 	return 1;
 
     /* Get provides information from header */
-    provides = rpmdsInit(rpmdsNew(h, RPMTAG_PROVIDENAME, scareMem));
+    provides = rpmdsInit(rpmdsNew(h, RPMTAG_PROVIDENAME, 0));
     if (provides == NULL)
 	goto exit;	/* XXX should never happen */
     if (nopromote)
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 2e98bb8..ff13426 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -77,7 +77,6 @@ static void addTE(rpmts ts, rpmte p, Header h,
 		fnpyKey key,
 		rpmRelocation * relocs)
 {
-    int scareMem = 0;
     rpmte savep;
     const char *name, *version, *release, *arch, *os;
     struct rpmtd_s td;
@@ -137,10 +136,10 @@ static void addTE(rpmts ts, rpmte p, Header h,
     p->pkgFileSize = 0;
 
     p->this = rpmdsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL);
-    p->provides = rpmdsNew(h, RPMTAG_PROVIDENAME, scareMem);
-    p->requires = rpmdsNew(h, RPMTAG_REQUIRENAME, scareMem);
-    p->conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, scareMem);
-    p->obsoletes = rpmdsNew(h, RPMTAG_OBSOLETENAME, scareMem);
+    p->provides = rpmdsNew(h, RPMTAG_PROVIDENAME, 0);
+    p->requires = rpmdsNew(h, RPMTAG_REQUIRENAME, 0);
+    p->conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, 0);
+    p->obsoletes = rpmdsNew(h, RPMTAG_OBSOLETENAME, 0);
 
     savep = rpmtsSetRelocateElement(ts, p);
     p->fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, RPMFI_NOHEADER|RPMFI_NOFILECLASS);
-- 
2.7.4