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

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:
Panu Matilainen 2008-11-11 22:37:12 +02:00
parent 2f6e1bbb80
commit 90cb50ff7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/transaction.c
View File

@ -1063,7 +1063,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
struct rpmffi_s ffi; struct rpmffi_s ffi;
ffi.fi = fi; ffi.fi = fi;
ffi.fileno = i; ffi.fileno = i;
if (XFA_SKIPPING(fi->actions[i])) if (XFA_SKIPPING(rpmfiFAction(fi)))
continue; continue;
rpmFpHashAddEntry(ts->ht, fi->fps + i, ffi); rpmFpHashAddEntry(ts->ht, fi->fps + i, ffi);
} }
@ -1087,7 +1087,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
fi = rpmfiInit(fi, 0); fi = rpmfiInit(fi, 0);
if (fi != NULL) /* XXX lclint */ if (fi != NULL) /* XXX lclint */
while ((i = rpmfiNext(fi)) >= 0) { while ((i = rpmfiNext(fi)) >= 0) {
if (XFA_SKIPPING(fi->actions[i])) if (XFA_SKIPPING(rpmfiFAction(fi)))
continue; continue;
fpLookupSubdir(ts->ht, newht, fpc, fi, i); fpLookupSubdir(ts->ht, newht, fpc, fi, i);
} }