A few more rpmdb variable/argument renames, missed in previous round

diff --git a/lib/backend/dbconfig.c b/lib/backend/dbconfig.c
index 97b787b..046fcf5 100644 (file)
--- a/lib/backend/dbconfig.c
+++ b/lib/backend/dbconfig.c
@@ -91,7 +91,7 @@ dbiIndex dbiFree(dbiIndex dbi)
 static const char * const dbi_config_default =
     "hash:cdb:verbose";
 
-dbiIndex dbiNew(rpmdb rpmdb, rpmTag rpmtag)
+dbiIndex dbiNew(rpmdb rdb, rpmTag rpmtag)
 {
     dbiIndex dbi = xcalloc(1, sizeof(*dbi));
     char *dbOpts;
@@ -226,7 +226,7 @@ dbiIndex dbiNew(rpmdb rpmdb, rpmTag rpmtag)
     memset(&staticdbi, 0, sizeof(staticdbi));
 
     /* FIX: figger lib/dbi refcounts */
-    dbi->dbi_rpmdb = rpmdb;
+    dbi->dbi_rpmdb = rdb;
     dbi->dbi_file = rpmTagGetName(rpmtag);
     dbi->dbi_type = (rpmtag == RPMDBI_PACKAGES) ? DBI_PRIMARY : DBI_SECONDARY;
     dbi->dbi_byteswapped = -1; /* -1 unknown, 0 native order, 1 alien order */

diff --git a/lib/backend/dbi.h b/lib/backend/dbi.h
index e76f0e1..dba314a 100644 (file)
--- a/lib/backend/dbi.h
+++ b/lib/backend/dbi.h
@@ -81,12 +81,12 @@ extern "C" {
 
 /** \ingroup dbi
  * Return new configured index database handle instance.
- * @param rpmdb                rpm database
+ * @param rdb          rpm database
  * @param rpmtag       rpm tag
  * @return             index database handle
  */
 RPM_GNUC_INTERNAL
-dbiIndex dbiNew(rpmdb rpmdb, rpmTag rpmtag);
+dbiIndex dbiNew(rpmdb rdb, rpmTag rpmtag);
 
 /** \ingroup dbi
  * Destroy index database handle instance.
@@ -114,7 +114,7 @@ char * prDbiOpenFlags(int dbflags, int print_dbenv_flags);
  * @return             0 on success
  */
 RPM_GNUC_INTERNAL
-int dbiOpen(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip, int flags);
+int dbiOpen(rpmdb rdb, rpmTag rpmtag, dbiIndex * dbip, int flags);
 
 
 /* FIX: vector annotations */