From: Ralf Corsépius <corsepiu@fedoraproject.org>
Date: Tue, 23 Oct 2007 11:20:19 +0000 (+0200)
Subject: Eliminate dead code in setPathDefault, setVarDefault.
X-Git-Tag: tznext/4.11.0.1.tizen20130304~5134
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c647570dcc4d56a84b8adf12bd0ad61dc4c974c;p=tools%2Flibrpm-tizen.git

Eliminate dead code in setPathDefault, setVarDefault.
---

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 763dcfa..c6d7f36 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -419,10 +419,7 @@ const char * lookupInDefaultTable(const char * name,
 static void setVarDefault(int var, const char * macroname, const char * val,
 		const char * body)
 {
-    if (var >= 0) {	/* XXX Dying ... */
-	if (rpmGetVar(var)) return;
-	rpmSetVar(var, val);
-    }
+    assert(!(var >= 0)); /* must not happen */
     if (body == NULL)
 	body = val;
     addMacro(NULL, macroname, NULL, body, RMIL_DEFAULT);
@@ -430,24 +427,7 @@ static void setVarDefault(int var, const char * macroname, const char * val,
 
 static void setPathDefault(int var, const char * macroname, const char * subdir)
 {
-
-    if (var >= 0) {	/* XXX Dying ... */
-	const char * topdir;
-	char * fn;
-
-	if (rpmGetVar(var)) return;
-
-	topdir = rpmGetPath("%{_topdir}", NULL);
-
-	fn = alloca(strlen(topdir) + strlen(subdir) + 2);
-	strcpy(fn, topdir);
-	if (fn[strlen(topdir) - 1] != '/')
-	    strcat(fn, "/");
-	strcat(fn, subdir);
-
-	rpmSetVar(var, fn);
-	topdir = _free(topdir);
-    }
+    assert(!(var >= 0)); /* must not happen */
 
     if (macroname != NULL) {
 #define	_TOPDIRMACRO	"%{_topdir}/"