- bdb environments are per db_home, not per file so dbfile etc dont make
sense here
-static int db_fini(dbiIndex dbi, const char * dbhome,
- const char * dbfile,
- const char * dbsubfile)
+static int db_fini(dbiIndex dbi, const char * dbhome)
{
rpmdb rpmdb = dbi->dbi_rpmdb;
DB_ENV * dbenv = rpmdb->db_dbenv;
{
rpmdb rpmdb = dbi->dbi_rpmdb;
DB_ENV * dbenv = rpmdb->db_dbenv;
rc = dbenv->close(dbenv, 0);
rc = cvtdberr(dbi, "dbenv->close", rc, _debug);
rc = dbenv->close(dbenv, 0);
rc = cvtdberr(dbi, "dbenv->close", rc, _debug);
- if (dbfile)
- rpmlog(RPMLOG_DEBUG, "closed db environment %s/%s\n",
- dbhome, dbfile);
+ rpmlog(RPMLOG_DEBUG, "closed db environment %s\n", dbhome);
if (rpmdb->db_remove_env) {
int xx;
if (rpmdb->db_remove_env) {
int xx;
xx = dbenv->remove(dbenv, dbhome, 0);
xx = cvtdberr(dbi, "dbenv->remove", xx, _debug);
xx = dbenv->remove(dbenv, dbhome, 0);
xx = cvtdberr(dbi, "dbenv->remove", xx, _debug);
- if (dbfile)
- rpmlog(RPMLOG_DEBUG, "removed db environment %s/%s\n",
- dbhome, dbfile);
+ rpmlog(RPMLOG_DEBUG, "removed db environment %s\n", dbhome);
-static int db_init(dbiIndex dbi, const char * dbhome,
- const char * dbfile,
- const char * dbsubfile,
- DB_ENV ** dbenvp)
+static int db_init(dbiIndex dbi, const char * dbhome, DB_ENV ** dbenvp)
{
rpmdb rpmdb = dbi->dbi_rpmdb;
DB_ENV *dbenv = NULL;
{
rpmdb rpmdb = dbi->dbi_rpmdb;
DB_ENV *dbenv = NULL;
eflags = (dbi->dbi_oeflags | dbi->dbi_eflags);
if (eflags & DB_JOINENV) eflags &= DB_JOINENV;
eflags = (dbi->dbi_oeflags | dbi->dbi_eflags);
if (eflags & DB_JOINENV) eflags &= DB_JOINENV;
- if (dbfile) {
- char *dbiflags = prDbiOpenFlags(eflags, 1);
- rpmlog(RPMLOG_DEBUG, "opening db environment %s/%s %s\n",
- dbhome, dbfile, dbiflags);
- free(dbiflags);
+ { char *fstr = prDbiOpenFlags(eflags, 1);
+ rpmlog(RPMLOG_DEBUG, "opening db environment %s %s\n", dbhome, fstr);
+ free(fstr);
}
/* XXX Can't do RPC w/o host. */
}
/* XXX Can't do RPC w/o host. */
if (rpmdb->db_dbenv != NULL && dbi->dbi_use_dbenv) {
if (rpmdb->db_opens == 1) {
if (rpmdb->db_dbenv != NULL && dbi->dbi_use_dbenv) {
if (rpmdb->db_opens == 1) {
- xx = db_fini(dbi, (dbhome ? dbhome : ""), dbfile, dbsubfile);
+ xx = db_fini(dbi, (dbhome ? dbhome : ""));
rpmdb->db_dbenv = NULL;
}
rpmdb->db_opens--;
rpmdb->db_dbenv = NULL;
}
rpmdb->db_opens--;
if (dbi->dbi_use_dbenv) {
if (rpmdb->db_dbenv == NULL) {
if (dbi->dbi_use_dbenv) {
if (rpmdb->db_dbenv == NULL) {
- rc = db_init(dbi, dbhome, dbfile, dbsubfile, &dbenv);
+ rc = db_init(dbi, dbhome, &dbenv);
if (rc == 0) {
rpmdb->db_dbenv = dbenv;
rpmdb->db_opens = 1;
if (rc == 0) {
rpmdb->db_dbenv = dbenv;
rpmdb->db_opens = 1;