folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Eliminate dead code in setPathDefault, setVarDefault.

This commit is contained in:
Ralf Corsépius 2007-10-23 13:20:19 +02:00
parent 2f40e20540
commit 4c647570dc
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/rpmrc.c
View File

@ -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}/"