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

Use accessor functions for file and directory names and id's 

- No functional changes, just making next steps easier (and eliminating
  redundant code as well)
This commit is contained in:
Panu Matilainen 2013-11-13 13:39:09 +02:00
parent ac0d3a284c
commit 2b48d1aa83
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/rpmfi.c
View File

@ -234,32 +234,20 @@ rpmsid rpmfilesDNId(rpmfiles fi, int jx)
const char * rpmfilesBN(rpmfiles fi, int ix)
{
const char * BN = NULL;
if (fi != NULL && ix >= 0 && ix < rpmfilesFC(fi)) {
if (fi->bnid != NULL)
BN = rpmstrPoolStr(fi->pool, fi->bnid[ix]);
}
return BN;
return (fi != NULL) ? rpmstrPoolStr(fi->pool, rpmfilesBNId(fi, ix)) : NULL;
}
const char * rpmfilesDN(rpmfiles fi, int jx)
{
const char * DN = NULL;
if (fi != NULL && jx >= 0 && jx < rpmfilesDC(fi)) {
if (fi->dnid != NULL)
DN = rpmstrPoolStr(fi->pool, fi->dnid[jx]);
}
return DN;
return (fi != NULL) ? rpmstrPoolStr(fi->pool, rpmfilesDNId(fi, jx)) : NULL;
}
char * rpmfilesFN(rpmfiles fi, int ix)
{
char *fn = NULL;
if (fi != NULL && ix >= 0 && ix < rpmfilesFC(fi)) {
fn = rstrscat(NULL, rpmstrPoolStr(fi->pool, fi->dnid[fi->dil[ix]]),
rpmstrPoolStr(fi->pool, fi->bnid[ix]), NULL);
fn = rstrscat(NULL, rpmfilesDN(fi, rpmfilesDI(fi, ix)),
rpmfilesBN(fi, ix), NULL);
}
return fn;
}