Replace all rpmMessage() uses with rpmlog()

3 files changed, 54 insertions, 54 deletions

diff --git a/rpmdb/db3.c b/rpmdb/db3.c
index 3f8299463..af2866747 100644
--- a/rpmdb/db3.c
+++ b/rpmdb/db3.c
@@ -171,7 +171,7 @@ static int db_fini(dbiIndex dbi, const char * dbhome,
     rc = cvtdberr(dbi, "dbenv->close", rc, _debug);
 
     if (dbfile)
-	rpmMessage(RPMMESS_DEBUG, _("closed   db environment %s/%s\n"),
+	rpmlog(RPMMESS_DEBUG, _("closed   db environment %s/%s\n"),
 			dbhome, dbfile);
 
     if (rpmdb->db_remove_env) {
@@ -183,7 +183,7 @@ static int db_fini(dbiIndex dbi, const char * dbhome,
 	xx = cvtdberr(dbi, "dbenv->remove", xx, _debug);
 
 	if (dbfile)
-	    rpmMessage(RPMMESS_DEBUG, _("removed  db environment %s/%s\n"),
+	    rpmlog(RPMMESS_DEBUG, _("removed  db environment %s/%s\n"),
 			dbhome, dbfile);
 
     }
@@ -238,7 +238,7 @@ static int db_init(dbiIndex dbi, const char * dbhome,
     if (eflags & DB_JOINENV) eflags &= DB_JOINENV;
 
     if (dbfile)
-	rpmMessage(RPMMESS_DEBUG, _("opening  db environment %s/%s %s\n"),
+	rpmlog(RPMMESS_DEBUG, _("opening  db environment %s/%s %s\n"),
 		dbhome, dbfile, prDbiOpenFlags(eflags, 1));
 
     /* XXX Can't do RPC w/o host. */
@@ -677,7 +677,7 @@ static int db3close(dbiIndex dbi, unsigned int flags)
 	rc = cvtdberr(dbi, "db->close", rc, _printit);
 	db = dbi->dbi_db = NULL;
 
-	rpmMessage(RPMMESS_DEBUG, _("closed   db index       %s/%s\n"),
+	rpmlog(RPMMESS_DEBUG, _("closed   db index       %s/%s\n"),
 		dbhome, (dbfile ? dbfile : rpmTagGetName(dbi->dbi_rpmtag)));
 
     }
@@ -734,7 +734,7 @@ static int db3close(dbiIndex dbi, unsigned int flags)
 		rc = db->verify(db, dbf, NULL, NULL, flags);
 		rc = cvtdberr(dbi, "db->verify", rc, _debug);
 
-		rpmMessage(RPMMESS_DEBUG, _("verified db index       %s/%s\n"),
+		rpmlog(RPMMESS_DEBUG, _("verified db index       %s/%s\n"),
 			(dbhome ? dbhome : ""),
 			(dbfile ? dbfile : rpmTagGetName(dbi->dbi_rpmtag)));
 
@@ -945,7 +945,7 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip)
 	}
     }
 
-    rpmMessage(RPMMESS_DEBUG, _("opening  db index       %s/%s %s mode=0x%x\n"),
+    rpmlog(RPMMESS_DEBUG, _("opening  db index       %s/%s %s mode=0x%x\n"),
 		dbhome, (dbfile ? dbfile : rpmTagGetName(dbi->dbi_rpmtag)),
 		prDbiOpenFlags(oflags, 0), dbi->dbi_mode);
 
@@ -1162,7 +1162,7 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip)
 					? _("exclusive") : _("shared")),
 				dbhome, (dbfile ? dbfile : ""));
 		    } else if (dbfile) {
-			rpmMessage(RPMMESS_DEBUG,
+			rpmlog(RPMMESS_DEBUG,
 				_("locked   db index       %s/%s\n"),
 				dbhome, dbfile);
 		    }
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 670ec5356..bd6987371 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -170,7 +170,7 @@ static void dbiTagsInit(void)
 	    *oe++ = '\0';
 	rpmtag = rpmTagGetValue(o);
 	if (rpmtag < 0) {
-	    rpmMessage(RPMMESS_WARNING,
+	    rpmlog(RPMMESS_WARNING,
 		_("dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"), o);
 	    continue;
 	}
@@ -234,7 +234,7 @@ dbiIndex dbiOpen(rpmdb db, rpmTag rpmtag, unsigned int flags)
     default:
 	_dbapi = _dbapi_wanted;
 	if (_dbapi < 0 || _dbapi >= 5 || mydbvecs[_dbapi] == NULL) {
-            rpmMessage(RPMMESS_DEBUG, "dbiOpen: _dbiapi failed\n");
+            rpmlog(RPMMESS_DEBUG, "dbiOpen: _dbiapi failed\n");
 	    return NULL;
 	}
 	errno = 0;
@@ -653,7 +653,7 @@ int rpmdbCheckSignals(void)
 {
     if (rpmdbCheckTerminate(0)) {
 /* sigset_t is abstract type */
-	rpmMessage(RPMMESS_DEBUG, "Exiting on signal(0x%lx) ...\n", *((unsigned long *)&rpmsqCaught));
+	rpmlog(RPMMESS_DEBUG, "Exiting on signal(0x%lx) ...\n", *((unsigned long *)&rpmsqCaught));
 	exit(EXIT_FAILURE);
     }
     return 0;
@@ -1486,7 +1486,7 @@ static int miFreeHeader(rpmdbMatchIterator mi, dbiIndex dbi)
 
 	    rpmrc = (*mi->mi_hdrchk) (mi->mi_ts, data->data, data->size, &msg);
 	    lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMMESS_DEBUG);
-	    rpmMessage(lvl, "%s h#%8u %s",
+	    rpmlog(lvl, "%s h#%8u %s",
 		(rpmrc == RPMRC_FAIL ? _("miFreeHeader: skipping") : "write"),
 			mi->mi_prevoffset, (msg ? msg : "\n"));
 	    msg = _free(msg);
@@ -2112,7 +2112,7 @@ if (dbiByteSwapped(dbi) == 1)
 
 	    rpmrc = (*mi->mi_hdrchk) (mi->mi_ts, uh, uhlen, &msg);
 	    lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMMESS_DEBUG);
-	    rpmMessage(lvl, "%s h#%8u %s",
+	    rpmlog(lvl, "%s h#%8u %s",
 		(rpmrc == RPMRC_FAIL ? _("rpmdbNextIterator: skipping") : " read"),
 			mi->mi_offset, (msg ? msg : "\n"));
 	    msg = _free(msg);
@@ -2451,7 +2451,7 @@ memset(data, 0, sizeof(*data));
 
     {	const char *n, *v, *r;
 	(void) headerNVR(h, &n, &v, &r);
-	rpmMessage(RPMMESS_DEBUG, "  --- h#%8u %s-%s-%s\n", hdrNum, n, v, r);
+	rpmlog(RPMMESS_DEBUG, "  --- h#%8u %s-%s-%s\n", hdrNum, n, v, r);
     }
 
     (void) blockSignals(db, &signalMask);
@@ -2600,11 +2600,11 @@ if (dbiByteSwapped(dbi) == 1)
 
 		if (!printed) {
 		    if (rpmcnt == 1 && stringvalued) {
-			rpmMessage(RPMMESS_DEBUG,
+			rpmlog(RPMMESS_DEBUG,
 				_("removing \"%s\" from %s index.\n"),
 				(char *)key->data, rpmTagGetName(dbi->dbi_rpmtag));
 		    } else {
-			rpmMessage(RPMMESS_DEBUG,
+			rpmlog(RPMMESS_DEBUG,
 				_("removing %d entries from %s index.\n"),
 				rpmcnt, rpmTagGetName(dbi->dbi_rpmtag));
 		    }
@@ -2866,7 +2866,7 @@ data->size = headerSizeof(h, HEADER_MAGIC_NO);
 
 		    rpmrc = (*hdrchk) (ts, data->data, data->size, &msg);
 		    lvl = (rpmrc == RPMRC_FAIL ? RPMMESS_ERROR : RPMMESS_DEBUG);
-		    rpmMessage(lvl, "%s h#%8u %s",
+		    rpmlog(lvl, "%s h#%8u %s",
 			(rpmrc == RPMRC_FAIL ? _("rpmdbAdd: skipping") : "  +++"),
 				hdrNum, (msg ? msg : "\n"));
 		    msg = _free(msg);
@@ -3022,11 +3022,11 @@ data->size = 0;
 
 		if (!printed) {
 		    if (rpmcnt == 1 && stringvalued) {
-			rpmMessage(RPMMESS_DEBUG,
+			rpmlog(RPMMESS_DEBUG,
 				_("adding \"%s\" to %s index.\n"),
 				(char *)key->data, rpmTagGetName(dbi->dbi_rpmtag));
 		    } else {
-			rpmMessage(RPMMESS_DEBUG,
+			rpmlog(RPMMESS_DEBUG,
 				_("adding %d entries to %s index.\n"),
 				rpmcnt, rpmTagGetName(dbi->dbi_rpmtag));
 		    }
@@ -3418,7 +3418,7 @@ static int rpmdbMoveDatabase(const char * prefix,
 	const char * mdb1 = "/etc/rpm/macros.db1";
 	struct stat st;
 	if (!stat(mdb1, &st) && S_ISREG(st.st_mode) && !unlink(mdb1))
-	    rpmMessage(RPMMESS_DEBUG,
+	    rpmlog(RPMMESS_DEBUG,
 		_("removing %s after successful db3 rebuild.\n"), mdb1);
     }
 #endif
@@ -3450,7 +3450,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
     tfn = rpmGetPath("%{?_dbpath}", NULL);
     if (!(tfn && tfn[0] != '\0'))
     {
-	rpmMessage(RPMMESS_DEBUG, _("no dbpath has been set"));
+	rpmlog(RPMMESS_DEBUG, _("no dbpath has been set"));
 	rc = 1;
 	goto exit;
     }
@@ -3476,7 +3476,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
 	newdbpath += strlen(prefix) - 1;
     tfn = _free(tfn);
 
-    rpmMessage(RPMMESS_DEBUG, _("rebuilding database %s into %s\n"),
+    rpmlog(RPMMESS_DEBUG, _("rebuilding database %s into %s\n"),
 	rootdbpath, newrootdbpath);
 
     if (!access(newrootdbpath, F_OK)) {
@@ -3486,7 +3486,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
 	goto exit;
     }
 
-    rpmMessage(RPMMESS_DEBUG, _("creating directory %s\n"), newrootdbpath);
+    rpmlog(RPMMESS_DEBUG, _("creating directory %s\n"), newrootdbpath);
     if (Mkdir(newrootdbpath, 0755)) {
 	rpmlog(RPMERR_MKDIR, _("creating directory %s: %s\n"),
 	      newrootdbpath, strerror(errno));
@@ -3497,7 +3497,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
 
     _rebuildinprogress = 0;
 
-    rpmMessage(RPMMESS_DEBUG, _("opening old database with dbapi %d\n"),
+    rpmlog(RPMMESS_DEBUG, _("opening old database with dbapi %d\n"),
 		_dbapi);
     if (openDatabase(prefix, dbpath, _dbapi, &olddb, O_RDONLY, 0644, 
 		     RPMDB_FLAG_MINIMAL)) {
@@ -3506,7 +3506,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
     }
     _dbapi = olddb->db_api;
     _rebuildinprogress = 1;
-    rpmMessage(RPMMESS_DEBUG, _("opening new database with dbapi %d\n"),
+    rpmlog(RPMMESS_DEBUG, _("opening new database with dbapi %d\n"),
 		_dbapi_rebuild);
     (void) rpmDefineMacro(NULL, "_rpmdb_rebuild %{nil}", -1);
     if (openDatabase(prefix, newdbpath, _dbapi_rebuild, &newdb, O_RDWR | O_CREAT, 0644, 0)) {
@@ -3587,7 +3587,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
     xx = rpmdbClose(newdb);
 
     if (failed) {
-	rpmMessage(RPMMESS_NORMAL, _("failed to rebuild database: original database "
+	rpmlog(RPMMESS_NORMAL, _("failed to rebuild database: original database "
 		"remains in place\n"));
 
 	xx = rpmdbRemoveDatabase(prefix, newdbpath, _dbapi_rebuild);
@@ -3595,9 +3595,9 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
 	goto exit;
     } else if (!nocleanup) {
 	if (rpmdbMoveDatabase(prefix, newdbpath, _dbapi_rebuild, dbpath, _dbapi)) {
-	    rpmMessage(RPMMESS_ERROR, _("failed to replace old database with new "
+	    rpmlog(RPMMESS_ERROR, _("failed to replace old database with new "
 			"database!\n"));
-	    rpmMessage(RPMMESS_ERROR, _("replace files in %s with files from %s "
+	    rpmlog(RPMMESS_ERROR, _("replace files in %s with files from %s "
 			"to recover"), dbpath, newdbpath);
 	    rc = 1;
 	    goto exit;
@@ -3607,9 +3607,9 @@ int rpmdbRebuild(const char * prefix, rpmts ts,
 
 exit:
     if (removedir && !(rc == 0 && nocleanup)) {
-	rpmMessage(RPMMESS_DEBUG, _("removing directory %s\n"), newrootdbpath);
+	rpmlog(RPMMESS_DEBUG, _("removing directory %s\n"), newrootdbpath);
 	if (Rmdir(newrootdbpath))
-	    rpmMessage(RPMMESS_ERROR, _("failed to remove directory %s: %s\n"),
+	    rpmlog(RPMMESS_ERROR, _("failed to remove directory %s: %s\n"),
 			newrootdbpath, strerror(errno));
     }
     newrootdbpath = _free(newrootdbpath);
diff --git a/rpmdb/sqlite.c b/rpmdb/sqlite.c
index b57278a8a..64c510733 100644
--- a/rpmdb/sqlite.c
+++ b/rpmdb/sqlite.c
@@ -241,9 +241,9 @@ dbg_scp(scp);
     }
     if (scp->pStmt) {
 	xx = sqlite3_reset(scp->pStmt);
-	if (xx) rpmMessage(RPMMESS_WARNING, "reset %d\n", xx);
+	if (xx) rpmlog(RPMMESS_WARNING, "reset %d\n", xx);
 	xx = sqlite3_finalize(scp->pStmt);
-	if (xx) rpmMessage(RPMMESS_WARNING, "finalize %d\n", xx);
+	if (xx) rpmlog(RPMMESS_WARNING, "finalize %d\n", xx);
 	scp->pStmt = NULL;
     }
 
@@ -591,7 +591,7 @@ static int sql_busy_handler(void * dbi_void, int time)
 {
     dbiIndex dbi = (dbiIndex) dbi_void;
 
-    rpmMessage(RPMMESS_WARNING, _("Unable to get lock on db %s, retrying... (%d)\n"),
+    rpmlog(RPMMESS_WARNING, _("Unable to get lock on db %s, retrying... (%d)\n"),
 		dbi->dbi_file, time);
 
     (void) sleep(1);
@@ -679,7 +679,7 @@ fprintf(stderr, "\t%s(%d) type(%d) keytype %s\n", rpmTagGetName(dbi->dbi_rpmtag)
 
 exit:
     if (rc)
-	rpmMessage(RPMMESS_WARNING, "Unable to initDB %s (%d)\n",
+	rpmlog(RPMMESS_WARNING, "Unable to initDB %s (%d)\n",
 		scp->pzErrmsg, rc);
 
     scp = scpFree(scp);
@@ -742,7 +742,7 @@ enterChroot(dbi);
 
 	(void) sqlite3_close(sqldb->db);
 
-	rpmMessage(RPMMESS_DEBUG, _("closed   sql db         %s\n"),
+	rpmlog(RPMMESS_DEBUG, _("closed   sql db         %s\n"),
 		dbi->dbi_subfile);
 
 	dbi->dbi_stats = _free(dbi->dbi_stats);
@@ -832,7 +832,7 @@ enterChroot(dbi);
        
     dbfname = rpmGenPath(dbhome, dbi->dbi_file, NULL);
 
-    rpmMessage(RPMMESS_DEBUG, _("opening  sql db         %s (%s) mode=0x%x\n"),
+    rpmlog(RPMMESS_DEBUG, _("opening  sql db         %s (%s) mode=0x%x\n"),
 		dbfname, dbi->dbi_subfile, dbi->dbi_mode);
 
     /* Open the Database */
@@ -851,7 +851,7 @@ enterChroot(dbi);
     dbi->dbi_db = (DB *)sqldb;
 
     if (sql_errcode != NULL) {
-      rpmMessage(RPMMESS_DEBUG, "Unable to open database: %s\n", sql_errcode);
+      rpmlog(RPMMESS_DEBUG, "Unable to open database: %s\n", sql_errcode);
       rc = EINVAL;
     }
 
@@ -948,14 +948,14 @@ enterChroot(dbi);
 	dbi->dbi_subfile);
 
     rc = sqlite3_prepare(sqldb->db, scp->cmd, strlen(scp->cmd), &scp->pStmt, &scp->pzErrmsg);
-    if (rc) rpmMessage(RPMMESS_WARNING, "cdel(%s) prepare %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
+    if (rc) rpmlog(RPMMESS_WARNING, "cdel(%s) prepare %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
     rc = sql_bind_key(dbi, scp, 1, key);
-    if (rc) rpmMessage(RPMMESS_WARNING, "cdel(%s) bind key %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
+    if (rc) rpmlog(RPMMESS_WARNING, "cdel(%s) bind key %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
     rc = sql_bind_data(dbi, scp, 2, data);
-    if (rc) rpmMessage(RPMMESS_WARNING, "cdel(%s) bind data %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
+    if (rc) rpmlog(RPMMESS_WARNING, "cdel(%s) bind data %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
 
     rc = sql_step(dbi, scp);
-    if (rc) rpmMessage(RPMMESS_WARNING, "cdel(%s) sql_step rc %d\n", dbi->dbi_subfile, rc);
+    if (rc) rpmlog(RPMMESS_WARNING, "cdel(%s) sql_step rc %d\n", dbi->dbi_subfile, rc);
 
     scp = scpFree(scp);
 
@@ -1023,10 +1023,10 @@ assert(dbi->dbi_rpmtag == RPMDBI_PACKAGES);
 	        break;
 	    }
 	    rc = sqlite3_prepare(sqldb->db, scp->cmd, strlen(scp->cmd), &scp->pStmt, &scp->pzErrmsg);
-	    if (rc) rpmMessage(RPMMESS_WARNING, "cget(%s) sequential prepare %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
+	    if (rc) rpmlog(RPMMESS_WARNING, "cget(%s) sequential prepare %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
 
 	    rc = sql_step(dbi, scp);
-	    if (rc) rpmMessage(RPMMESS_WARNING, "cget(%s) sequential sql_step rc %d\n", dbi->dbi_subfile, rc);
+	    if (rc) rpmlog(RPMMESS_WARNING, "cget(%s) sequential sql_step rc %d\n", dbi->dbi_subfile, rc);
 
 	    scp = scpResetKeys(scp);
 	    scp->nkeys = scp->nr;
@@ -1056,7 +1056,7 @@ assert(dbi->dbi_rpmtag == RPMDBI_PACKAGES);
         scp->cmd = sqlite3_mprintf("SELECT value FROM '%q' WHERE key=?;", dbi->dbi_subfile);
         rc = sqlite3_prepare(sqldb->db, scp->cmd, strlen(scp->cmd), &scp->pStmt, &scp->pzErrmsg);
 
-        if (rc) rpmMessage(RPMMESS_WARNING, "cget(%s) prepare %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
+        if (rc) rpmlog(RPMMESS_WARNING, "cget(%s) prepare %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
     }
 
     scp = scpResetAv(scp);	/* Free av and avlen, reset counters.*/
@@ -1070,13 +1070,13 @@ assert(dbi->dbi_rpmtag == RPMDBI_PACKAGES);
 
     /* Bind key to prepared statement */
     rc = sql_bind_key(dbi, scp, 1, scp->keys[scp->rx]);
-    if (rc) rpmMessage(RPMMESS_WARNING, "cget(%s)  key bind %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
+    if (rc) rpmlog(RPMMESS_WARNING, "cget(%s)  key bind %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
 
     rc = sql_step(dbi, scp);
-    if (rc) rpmMessage(RPMMESS_WARNING, "cget(%s) sql_step rc %d\n", dbi->dbi_subfile, rc);
+    if (rc) rpmlog(RPMMESS_WARNING, "cget(%s) sql_step rc %d\n", dbi->dbi_subfile, rc);
 
     rc = sqlite3_reset(scp->pStmt);
-    if (rc) rpmMessage(RPMMESS_WARNING, "reset %d\n", rc);
+    if (rc) rpmlog(RPMMESS_WARNING, "reset %d\n", rc);
 
 /* 1 key should return 0 or 1 row/value */
 assert(scp->nr < 2);
@@ -1166,14 +1166,14 @@ enterChroot(dbi);
 	scp->cmd = sqlite3_mprintf("INSERT OR REPLACE INTO '%q' VALUES(?, ?);",
 		dbi->dbi_subfile);
 	rc = sqlite3_prepare(sqldb->db, scp->cmd, strlen(scp->cmd), &scp->pStmt, &scp->pzErrmsg);
-	if (rc) rpmMessage(RPMMESS_WARNING, "cput(%s) prepare %s (%d)\n",dbi->dbi_subfile,  sqlite3_errmsg(sqldb->db), rc);
+	if (rc) rpmlog(RPMMESS_WARNING, "cput(%s) prepare %s (%d)\n",dbi->dbi_subfile,  sqlite3_errmsg(sqldb->db), rc);
 	rc = sql_bind_key(dbi, scp, 1, key);
-	if (rc) rpmMessage(RPMMESS_WARNING, "cput(%s)  key bind %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
+	if (rc) rpmlog(RPMMESS_WARNING, "cput(%s)  key bind %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
 	rc = sql_bind_data(dbi, scp, 2, data);
-	if (rc) rpmMessage(RPMMESS_WARNING, "cput(%s) data bind %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
+	if (rc) rpmlog(RPMMESS_WARNING, "cput(%s) data bind %s (%d)\n", dbi->dbi_subfile, sqlite3_errmsg(sqldb->db), rc);
 
 	rc = sql_step(dbi, scp);
-	if (rc) rpmMessage(RPMMESS_WARNING, "cput(%s) sql_step rc %d\n", dbi->dbi_subfile, rc);
+	if (rc) rpmlog(RPMMESS_WARNING, "cput(%s) sql_step rc %d\n", dbi->dbi_subfile, rc);
 
 	break;
     }
@@ -1213,10 +1213,10 @@ assert(scp->av != NULL);
 
     } else {
 	if ( sql_rc ) {
-	    rpmMessage(RPMMESS_DEBUG, "db_info failed %s (%d)\n",
+	    rpmlog(RPMMESS_DEBUG, "db_info failed %s (%d)\n",
 		scp->pzErrmsg, sql_rc);
 	}
-	rpmMessage(RPMMESS_WARNING, "Unable to determine DB endian.\n");
+	rpmlog(RPMMESS_WARNING, "Unable to determine DB endian.\n");
     }
 
     scp = scpFree(scp);
@@ -1344,11 +1344,11 @@ enterChroot(dbi);
 assert(scp->av != NULL);
 	nkeys = strtol(scp->av[1], NULL, 10);
 
-	rpmMessage(RPMMESS_DEBUG, "  stat on %s nkeys %ld\n",
+	rpmlog(RPMMESS_DEBUG, "  stat on %s nkeys %ld\n",
 		dbi->dbi_subfile, nkeys);
     } else {
 	if ( rc ) {
-	    rpmMessage(RPMMESS_DEBUG, "stat failed %s (%d)\n",
+	    rpmlog(RPMMESS_DEBUG, "stat failed %s (%d)\n",
 		scp->pzErrmsg, rc);
 	}
     }