Remove scareMemory remnants from the internal API, fixup callers

diff --git a/lib/fprint.c b/lib/fprint.c
index cbb2ed8..2f6f1d5 100644 (file)
--- a/lib/fprint.c
+++ b/lib/fprint.c
@@ -244,7 +244,7 @@ exit:
 }
 
 int fpLookup(fingerPrintCache cache,
-             const char * dirName, const char * baseName, int scareMemory,
+             const char * dirName, const char * baseName,
              fingerPrint **fp)
 {
     if (*fp == NULL)

diff --git a/lib/fprint.h b/lib/fprint.h
index 1eae4d2..ca0f6fc 100644 (file)
--- a/lib/fprint.h
+++ b/lib/fprint.h
@@ -66,13 +66,12 @@ dev_t fpEntryDev(fingerPrintCache cache, fingerPrint *fp);
  * @param cache                pointer to fingerprint cache
  * @param dirName      leading directory name of file path
  * @param baseName     base name of file path
- * @param scareMemory
  * @retval fp          pointer of fingerprint struct to fill out
  * @return             0 on success
  */
 RPM_GNUC_INTERNAL
 int fpLookup(fingerPrintCache cache,
-            const char * dirName, const char * baseName, int scareMemory,
+            const char * dirName, const char * baseName,
             fingerPrint **fp);
 
 /**
@@ -87,7 +86,6 @@ int fpEqual(const fingerPrint * key1, const fingerPrint * key2);
 
 /**
  * Return finger prints of an array of file paths.
- * @warning: scareMemory is assumed!
  * @param cache                pointer to fingerprint cache
  * @param pool         pointer to file name pool
  * @param dirNames     directory names

diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 22d2fe7..c024e7d 100644 (file)
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -959,7 +959,7 @@ static int rpmdbFindByFile(rpmdb db, dbiIndex dbi, const char *filespec,
 
     *matches = xcalloc(1, sizeof(**matches));
     fpc = fpCacheCreate(allMatches->count);
-    fpLookup(fpc, dirName, baseName, 1, &fp1);
+    fpLookup(fpc, dirName, baseName, &fp1);
 
     i = 0;
     while (i < allMatches->count) {

diff --git a/lib/transaction.c b/lib/transaction.c
index 3404643..ba8564e 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1012,7 +1012,7 @@ void checkInstalledFiles(rpmts ts, uint64_t fileCount, fingerPrintCache fpc)
                dirName = rpmtdGetString(&dnames);
                baseName = rpmtdGetString(&bnames);
 
-               fpLookup(fpc, dirName, baseName, 1, &fpp);
+               fpLookup(fpc, dirName, baseName, &fpp);
                fpIx = 0;
            } else {
                fpp = rpmfiFps(otherFi);