folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove scareMemory remnants from the internal API, fixup callers

This commit is contained in:
Panu Matilainen 2012-09-14 14:19:32 +03:00
parent 566a332c69
commit c66656052d
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/fprint.c
View File

@ -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)

4
lib/fprint.h
View File

@ -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

2
lib/rpmdb.c
View File

@ -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) {

2
lib/transaction.c
View File

@ -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);