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

Eliminate rpmteFI() use in rpmteColorDS() 

- Use a local iterator on te->files instead
This commit is contained in:
Panu Matilainen 2013-11-11 12:52:46 +02:00
parent 3a858ad5b0
commit d044e08ccb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/rpmte.c
View File

@ -604,7 +604,7 @@ rpmfiles rpmteFiles(rpmte te)
static void rpmteColorDS(rpmte te, rpmTag tag)
{
rpmfi fi = rpmteFI(te);
rpmfi fi;
rpmds ds = rpmteDS(te, tag);
char deptype = 'R';
char mydt;
@ -615,7 +615,7 @@ static void rpmteColorDS(rpmte te, rpmTag tag)
unsigned ix;
int ndx, i;
if (!(te && (Count = rpmdsCount(ds)) > 0 && rpmfiFC(fi) > 0))
if (!(te && (Count = rpmdsCount(ds)) > 0 && rpmfilesFC(te->files) > 0))
return;
switch (tag) {
@ -633,8 +633,7 @@ static void rpmteColorDS(rpmte te, rpmTag tag)
colors = xcalloc(Count, sizeof(*colors));
/* Calculate dependency color. */
fi = rpmfiInit(fi, 0);
if (fi != NULL)
fi = rpmfilesIter(te->files, RPMFI_ITER_FWD);
while (rpmfiNext(fi) >= 0) {
val = rpmfiFColor(fi);
ddict = NULL;
@ -659,6 +658,7 @@ assert (ix < Count);
(void) rpmdsSetColor(ds, val);
}
free(colors);
rpmfiFree(fi);
}
static Header rpmteDBHeader(rpmte te)