From 3bd1951bbd03d30f0ff83d1bd468d2c383c7807f Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 1 Apr 2010 12:48:17 +0300 Subject: [PATCH] Rename dbiOpen() + dbiOpenDB() to make their layer obvious from the name - dbiOpen() in rpmdb.c operates on "rpmdb layer" so calling it rpmdbOpenIndex(), dbiOpenDB() on the other hand is the lowest level backend thing, which is now called dbiOpen() to be in line with the other operations like dbiClose() --- lib/backend/db3.c | 2 +- lib/backend/dbi.h | 2 +- lib/rpmdb.c | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/backend/db3.c b/lib/backend/db3.c index 088c6e4..bd3f350 100644 --- a/lib/backend/db3.c +++ b/lib/backend/db3.c @@ -472,7 +472,7 @@ exit: return rc; } -int dbiOpenDB(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip) +int dbiOpen(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip) { const char *dbhome = rpmdbHome(rpmdb); dbiIndex dbi = NULL; diff --git a/lib/backend/dbi.h b/lib/backend/dbi.h index cd4f8f9..4990cfa 100644 --- a/lib/backend/dbi.h +++ b/lib/backend/dbi.h @@ -86,7 +86,7 @@ char * prDbiOpenFlags(int dbflags, int print_dbenv_flags); * @return 0 on success */ RPM_GNUC_INTERNAL -int dbiOpenDB(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip); +int dbiOpen(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip); /* FIX: vector annotations */ diff --git a/lib/rpmdb.c b/lib/rpmdb.c index 22731be..e324667 100644 --- a/lib/rpmdb.c +++ b/lib/rpmdb.c @@ -121,7 +121,7 @@ static inline pbm_set * PBM_REALLOC(pbm_set ** sp, int * odp, int nd) * @param flags (unused) * @return index database handle */ -static dbiIndex dbiOpen(rpmdb db, rpmTag rpmtag, unsigned int flags) +static dbiIndex rpmdbOpenIndex(rpmdb db, rpmTag rpmtag, unsigned int flags) { int dbix = -1; dbiIndex dbi = NULL; @@ -165,7 +165,7 @@ static dbiIndex dbiOpen(rpmdb db, rpmTag rpmtag, unsigned int flags) } errno = 0; dbi = NULL; - rc = dbiOpenDB(db, rpmtag, &dbi); + rc = dbiOpen(db, rpmtag, &dbi); if (rc) { static int _printed[32]; if (!_printed[dbix & 0x1f]++) @@ -641,7 +641,7 @@ int rpmdbOpenAll(rpmdb db) for (int dbix = 0; dbix < dbiTagsMax; dbix++) { if (db->_dbi[dbix] != NULL) continue; - (void) dbiOpen(db, dbiTags[dbix], db->db_flags); + (void) rpmdbOpenIndex(db, dbiTags[dbix], db->db_flags); } return rc; } @@ -806,7 +806,7 @@ static int openDatabase(const char * prefix, { rc = 0; for (int dbix = 0; rc == 0 && dbix < dbiTagsMax; dbix++) { rpmTag rpmtag = dbiTags[dbix]; - dbiIndex dbi = dbiOpen(db, rpmtag, 0); + dbiIndex dbi = rpmdbOpenIndex(db, rpmtag, 0); if (dbi == NULL) { rc = -2; @@ -963,7 +963,7 @@ static int rpmdbFindByFile(rpmdb db, const char * filespec, if (baseName == NULL) goto exit; - dbi = dbiOpen(db, dbtag, 0); + dbi = rpmdbOpenIndex(db, dbtag, 0); if (dbi != NULL) { dbcursor = NULL; xx = dbiCopen(dbi, &dbcursor, 0); @@ -1072,7 +1072,7 @@ int rpmdbCountPackages(rpmdb db, const char * name) memset(&key, 0, sizeof(key)); memset(&data, 0, sizeof(data)); - dbi = dbiOpen(db, dbtag, 0); + dbi = rpmdbOpenIndex(db, dbtag, 0); if (dbi == NULL) return 0; @@ -1373,7 +1373,7 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi) next->mi_next = NULL; } - dbi = dbiOpen(mi->mi_db, RPMDBI_PACKAGES, 0); + dbi = rpmdbOpenIndex(mi->mi_db, RPMDBI_PACKAGES, 0); if (dbi == NULL) /* XXX can't happen */ return NULL; @@ -1776,7 +1776,7 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi) if (mi == NULL) return NULL; - dbi = dbiOpen(mi->mi_db, RPMDBI_PACKAGES, 0); + dbi = rpmdbOpenIndex(mi->mi_db, RPMDBI_PACKAGES, 0); if (dbi == NULL) return NULL; @@ -1992,7 +1992,7 @@ static int rpmdbGrowIterator(rpmdbMatchIterator mi) if (key->data == NULL) return 1; - dbi = dbiOpen(mi->mi_db, mi->mi_rpmtag, 0); + dbi = rpmdbOpenIndex(mi->mi_db, mi->mi_rpmtag, 0); if (dbi == NULL) return 1; @@ -2069,7 +2069,7 @@ rpmdbMatchIterator rpmdbInitIterator(rpmdb db, rpmTag rpmtag, isLabel = 1; } - dbi = dbiOpen(db, rpmtag, 0); + dbi = rpmdbOpenIndex(db, rpmtag, 0); if (dbi == NULL) return NULL; @@ -2346,7 +2346,7 @@ int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum, struct rpmtd_s tagdata; if (rpmtag == RPMDBI_PACKAGES) { - dbi = dbiOpen(db, rpmtag, 0); + dbi = rpmdbOpenIndex(db, rpmtag, 0); if (dbi == NULL) /* XXX shouldn't happen */ continue; @@ -2373,7 +2373,7 @@ int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum, if (!headerGet(h, rpmtag, &tagdata, HEADERGET_MINMEM)) continue; - if (!(dbi = dbiOpen(db, rpmtag, 0))) { + if (!(dbi = rpmdbOpenIndex(db, rpmtag, 0))) { rpmtdFreeData(&tagdata); continue; } @@ -2502,7 +2502,7 @@ int rpmdbAdd(rpmdb db, int iid, Header h, (void) blockSignals(&signalMask); - dbi = dbiOpen(db, RPMDBI_PACKAGES, 0); + dbi = rpmdbOpenIndex(db, RPMDBI_PACKAGES, 0); if (dbi != NULL) { unsigned int firstkey = 0; void * keyp = &firstkey; @@ -2574,7 +2574,7 @@ int rpmdbAdd(rpmdb db, int iid, Header h, switch (rpmtag) { case RPMDBI_PACKAGES: - dbi = dbiOpen(db, rpmtag, 0); + dbi = rpmdbOpenIndex(db, rpmtag, 0); if (dbi == NULL) /* XXX shouldn't happen */ continue; xx = dbiCopen(dbi, &dbcursor, DB_WRITECURSOR); @@ -2630,7 +2630,7 @@ int rpmdbAdd(rpmdb db, int iid, Header h, tagdata.count = 1; } - if (!(dbi = dbiOpen(db, rpmtag, 0))) { + if (!(dbi = rpmdbOpenIndex(db, rpmtag, 0))) { rpmtdFreeData(&tagdata); continue; } -- 2.7.4