Convert obvious bits of rpmtsRun() to use rpmfiFAction()
authorPanu Matilainen <pmatilai@redhat.com>
Tue, 11 Nov 2008 20:37:12 +0000 (22:37 +0200)
committerPanu Matilainen <pmatilai@redhat.com>
Tue, 11 Nov 2008 20:37:12 +0000 (22:37 +0200)
- remaining access to fi->actions is the nasty part of copying things
  around to transfer state

lib/transaction.c

index 0efbf3d..23428b5 100644 (file)
@@ -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);
        }