summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2012-10-05 11:34:22 +0300
committerPanu Matilainen <pmatilai@redhat.com>2012-10-05 11:34:22 +0300
commit99d42b479ab341248901d5af82d5980542e6c702 (patch)
treec4799f978a3e5fecb8c05dfdcdd9c1b89a26960d /lib
parent2d62d5e5c515098e1b84d93fdcf9d8b2fe8dd5df (diff)
downloadlibrpm-tizen-99d42b479ab341248901d5af82d5980542e6c702.tar.gz
librpm-tizen-99d42b479ab341248901d5af82d5980542e6c702.tar.bz2
librpm-tizen-99d42b479ab341248901d5af82d5980542e6c702.zip
Rename rpmalProvidesHash to rpmalDepHash
- The same hash type is valid for any ds and we'll be adding more...
Diffstat (limited to 'lib')
-rw-r--r--lib/rpmal.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/rpmal.c b/lib/rpmal.c
index 1425339e8..c2b4fc8f7 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -45,7 +45,7 @@ struct fileNameEntry_s {
#undef HASHTYPE
#undef HTKEYTYPE
#undef HTDATATYPE
-#define HASHTYPE rpmalProvidesHash
+#define HASHTYPE rpmalDepHash
#define HTKEYTYPE rpmsid
#define HTDATATYPE struct availableIndexEntry_s
#include "lib/rpmhash.H"
@@ -66,7 +66,7 @@ struct fileNameEntry_s {
struct rpmal_s {
rpmstrPool pool; /*!< String pool */
availablePackage list; /*!< Set of packages. */
- rpmalProvidesHash providesHash;
+ rpmalDepHash providesHash;
rpmalFileHash fileHash;
int delta; /*!< Delta for pkg list reallocation. */
int size; /*!< No. of pkgs in list. */
@@ -82,7 +82,7 @@ struct rpmal_s {
*/
static void rpmalFreeIndex(rpmal al)
{
- al->providesHash = rpmalProvidesHashFree(al->providesHash);
+ al->providesHash = rpmalDepHashFree(al->providesHash);
al->fileHash = rpmalFileHashFree(al->fileHash);
}
@@ -228,7 +228,7 @@ static void rpmalAddProvides(rpmal al, rpmalNum pkgNum, rpmds provides)
continue;
indexEntry.entryIx = i;;
- rpmalProvidesHashAddEntry(al->providesHash,
+ rpmalDepHashAddEntry(al->providesHash,
rpmdsNIdIndex(provides, i), indexEntry);
}
}
@@ -304,7 +304,7 @@ static void rpmalMakeProvidesIndex(rpmal al)
providesCnt += rpmdsCount(alp->provides);
}
- al->providesHash = rpmalProvidesHashCreate(providesCnt/4+128,
+ al->providesHash = rpmalDepHashCreate(providesCnt/4+128,
sidHash, sidCmp, NULL, NULL);
for (i = 0; i < al->size; i++) {
alp = al->list + i;
@@ -386,7 +386,7 @@ rpmte * rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds)
if (al->providesHash == NULL)
rpmalMakeProvidesIndex(al);
- rpmalProvidesHashGetEntry(al->providesHash, nameId, &result,
+ rpmalDepHashGetEntry(al->providesHash, nameId, &result,
&resultCnt, NULL);
if (resultCnt==0) return NULL;