Avoid redundant ds -> id -> string lookups in rpmalAllFileSatisfiesDepend()

- We need to grab the dependency string in rpmalAllSatisfiesDepend()
  already to see whether its a file dependency or not, just pass that
  to the file deps to avoid redundant work.

diff --git a/lib/rpmal.c b/lib/rpmal.c
index adab5fe..948892f 100644 (file)
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -304,10 +304,8 @@ static void rpmalMakeIndex(rpmal al)
     }
 }
 
-static rpmte * rpmalAllFileSatisfiesDepend(const rpmal al, const rpmds ds)
+static rpmte * rpmalAllFileSatisfiesDepend(const rpmal al, const char *fileName)
 {
-    rpmsid fnId = rpmdsNId(ds);
-    const char *fileName = rpmstrPoolStr(al->pool, fnId);
     const char *slash; 
     rpmte * ret = NULL;
 
@@ -368,7 +366,7 @@ static rpmte * rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds)
     name = rpmstrPoolStr(al->pool, nameId);
     if (!obsolete && *name == '/') {
        /* First, look for files "contained" in package ... */
-       ret = rpmalAllFileSatisfiesDepend(al, ds);
+       ret = rpmalAllFileSatisfiesDepend(al, name);
        if (ret != NULL && *ret != NULL) {
            rpmdsNotify(ds, "(added files)", 0);
            return ret;