Convert obvious bits of rpmtsRun() to use rpmfiFAction()
- remaining access to fi->actions is the nasty part of copying things around to transfer state
This commit is contained in:
parent
2f6e1bbb80
commit
90cb50ff7a
|
@ -1063,7 +1063,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
|
|||
struct rpmffi_s ffi;
|
||||
ffi.fi = fi;
|
||||
ffi.fileno = i;
|
||||
if (XFA_SKIPPING(fi->actions[i]))
|
||||
if (XFA_SKIPPING(rpmfiFAction(fi)))
|
||||
continue;
|
||||
rpmFpHashAddEntry(ts->ht, fi->fps + i, ffi);
|
||||
}
|
||||
|
@ -1087,7 +1087,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
|
|||
fi = rpmfiInit(fi, 0);
|
||||
if (fi != NULL) /* XXX lclint */
|
||||
while ((i = rpmfiNext(fi)) >= 0) {
|
||||
if (XFA_SKIPPING(fi->actions[i]))
|
||||
if (XFA_SKIPPING(rpmfiFAction(fi)))
|
||||
continue;
|
||||
fpLookupSubdir(ts->ht, newht, fpc, fi, i);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue