From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 30 Mar 2010 22:41:04 +0000 (+0300)
Subject: Lose pointless per-db and per-dbi errfile and errcall pointers
X-Git-Tag: tznext/4.11.0.1.tizen20130304~2077
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7309f7498134f7b62f27624a4cdb91e1c6b82578;p=tools%2Flibrpm-tizen.git

Lose pointless per-db and per-dbi errfile and errcall pointers
- BDB uses stderr for errfile when not set, which is what we set it
  to through various hoops. Just leave it alone.
- db_errcall has always been (intentionally) NULL to disable that output,
  the errors get logged though cvtdberr() with slight filtering
---

diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index 7c40420..30d722d 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -101,10 +101,6 @@ static int db_init(dbiIndex dbi, const char * dbhome, DB_ENV ** dbenvp)
     if (dbenvp == NULL)
 	return 1;
 
-    /* XXX HACK */
-    if (rpmdb->db_errfile == NULL)
-	rpmdb->db_errfile = stderr;
-
     eflags = (dbi->dbi_oeflags | dbi->dbi_eflags);
     if (eflags & DB_JOINENV) eflags &= DB_JOINENV;
 
@@ -128,8 +124,7 @@ static int db_init(dbiIndex dbi, const char * dbhome, DB_ENV ** dbenvp)
 	goto errxit;
 
     dbenv->set_alloc(dbenv, rmalloc, rrealloc, NULL);
-    dbenv->set_errcall(dbenv, (void *) rpmdb->db_errcall);
-    dbenv->set_errfile(dbenv, rpmdb->db_errfile);
+    dbenv->set_errcall(dbenv, NULL);
     dbenv->set_errpfx(dbenv, rpmdb->db_errpfx);
 
 #if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 5)
@@ -441,8 +436,7 @@ int dbiClose(dbiIndex dbi, unsigned int flags)
 	rc = cvtdberr(dbi, "db_env_create", rc, _debug);
 	if (rc || dbenv == NULL) goto exit;
 
-	dbenv->set_errcall(dbenv, (void *) rpmdb->db_errcall);
-	dbenv->set_errfile(dbenv, rpmdb->db_errfile);
+	dbenv->set_errcall(dbenv, NULL);
 	dbenv->set_errpfx(dbenv, rpmdb->db_errpfx);
 #if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
 	xx = dbenv->set_verbose(dbenv, DB_VERB_CHKPOINT,
diff --git a/lib/rpmdb_internal.h b/lib/rpmdb_internal.h
index e1b886f..571950f 100644
--- a/lib/rpmdb_internal.h
+++ b/lib/rpmdb_internal.h
@@ -72,8 +72,6 @@ struct _dbiIndex {
 	/* dbenv parameters */
     int	dbi_lorder;
     /* XXX db-4.3.14 adds dbenv as 1st arg. */
-    void (*db_errcall) (void * dbenv, const char *db_errpfx, char *buffer);
-    FILE *	dbi_errfile;
     int	dbi_verbose;
 	/* mpool sub-system parameters */
     int	dbi_mmapsize;	/*!< (10Mb) */
@@ -126,8 +124,6 @@ struct rpmdb_s {
     int		db_remove_env;
     int		db_chrootDone;	/*!< If chroot(2) done, ignore db_root. */
     int		db_mkdirDone;	/*!< Has db_home been created? */
-    void (*db_errcall) (const char *db_errpfx, char *buffer);
-    FILE *	db_errfile;
     unsigned char * db_bits;	/*!< package instance bit mask. */
     int		db_nbits;	/*!< no. of bits in mask. */
     rpmdb	db_next;