From 90cb50ff7abab62d99cfcda1f64f451aa2fe41cb Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 11 Nov 2008 22:37:12 +0200 Subject: [PATCH] Convert obvious bits of rpmtsRun() to use rpmfiFAction() - remaining access to fi->actions is the nasty part of copying things around to transfer state --- lib/transaction.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/transaction.c b/lib/transaction.c index 0efbf3d..23428b5 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -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); } -- 2.7.4