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

Simplify rpmfcAddFileDep() 

- rpmfcHelper() already has the "deptype" character in the format
  we want for file deps, pass it as argument avoiding bunch of silliness
This commit is contained in:
Panu Matilainen 2010-02-17 17:03:19 +02:00
parent ad2c8485ea
commit 76c2fd5a93
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build/rpmfc.c
View File

@ -295,22 +295,15 @@ static int rpmfcSaveArg(ARGV_t * argvp, const char * key)
return rc;
}
static void rpmfcAddFileDep(ARGV_t * argvp, int ix, rpmds ds)
static void rpmfcAddFileDep(ARGV_t * argvp, int ix, rpmds ds, char deptype)
{
rpmTag tagN = rpmdsTagN(ds);
char *key = NULL;
if (ds == NULL) {
return;
if (ds) {
char *key = NULL;
rasprintf(&key, "%08d%c %s %s 0x%08x", ix, deptype,
rpmdsN(ds), rpmdsEVR(ds), rpmdsFlags(ds));
rpmfcSaveArg(argvp, key);
free(key);
}
assert(tagN == RPMTAG_PROVIDENAME || tagN == RPMTAG_REQUIRENAME);
rasprintf(&key, "%08d%c %s %s 0x%08x", ix, tagN == RPMTAG_PROVIDENAME ? 'P' : 'R',
rpmdsN(ds), rpmdsEVR(ds), rpmdsFlags(ds));
rpmfcSaveArg(argvp, key);
free(key);
}
/**
@ -415,7 +408,7 @@ assert(EVR != NULL);
xx = rpmdsMerge(depsp, ds);
/* Add to file dependencies. */
rpmfcAddFileDep(&fc->ddict, fc->ix, ds);
rpmfcAddFileDep(&fc->ddict, fc->ix, ds, deptype);
ds = rpmdsFree(ds);
}