Remove pointless per-index api version

diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index f6db60a..d15ccf4 100644 (file)
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -22,12 +22,13 @@ static int _debug = 1;      /* XXX if < 0 debugging, > 0 unusual error returns */
 static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit)
 {
     if (printit && error) {
+       int db_api = dbi->dbi_rpmdb->db_api;
        if (msg)
            rpmlog(RPMLOG_ERR, _("db%d error(%d) from %s: %s\n"),
-               dbi->dbi_api, error, msg, db_strerror(error));
+               db_api, error, msg, db_strerror(error));
        else
            rpmlog(RPMLOG_ERR, _("db%d error(%d): %s\n"),
-               dbi->dbi_api, error, db_strerror(error));
+               db_api, error, db_strerror(error));
     }
     return error;
 }
@@ -511,7 +512,6 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip)
      */
     if ((dbi = db3New(rpmdb, rpmtag)) == NULL)
        return 1;
-    dbi->dbi_api = DB_VERSION_MAJOR;
 
     /*
      * Get the prefix/root component and directory path.

diff --git a/lib/rpmdb_internal.h b/lib/rpmdb_internal.h
index 07391be..de7c23f 100644 (file)
--- a/lib/rpmdb_internal.h
+++ b/lib/rpmdb_internal.h
@@ -176,7 +176,6 @@ struct _dbiIndex {
     unsigned dbi_mode;         /*!< mode to use on open */
     int        dbi_perms;              /*!< file permission to use on open */
     long dbi_shmkey;           /*!< shared memory base key */
-    int        dbi_api;                /*!< Berkeley API type */
 
     int        dbi_verify_on_close;
     int        dbi_use_dbenv;          /*!< use db environment? */