diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2012-09-14 14:19:32 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2012-09-14 14:19:32 +0300 |
| commit | c66656052de4e58a30b637aef31399c9bd53c70b (patch) | |
| tree | ed3ec21a54b3e8a1ff970a5c18f1ae63492ae856 /lib | |
| parent | 566a332c6907a0969ea8f79a4c7a62bca2d1f1b4 (diff) | |
| download | librpm-tizen-c66656052de4e58a30b637aef31399c9bd53c70b.tar.gz librpm-tizen-c66656052de4e58a30b637aef31399c9bd53c70b.tar.bz2 librpm-tizen-c66656052de4e58a30b637aef31399c9bd53c70b.zip | |
Remove scareMemory remnants from the internal API, fixup callers
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fprint.c | 2 | ||||
| -rw-r--r-- | lib/fprint.h | 4 | ||||
| -rw-r--r-- | lib/rpmdb.c | 2 | ||||
| -rw-r--r-- | lib/transaction.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/lib/fprint.c b/lib/fprint.c index cbb2ed860..2f6f1d520 100644 --- 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 1eae4d2f2..ca0f6fcdf 100644 --- 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 22d2fe762..c024e7d22 100644 --- 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 3404643c5..ba8564ecc 100644 --- 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); |