diff options
Diffstat (limited to 'rpmdb')
| -rw-r--r-- | rpmdb/rpmdb.c | 16 | ||||
| -rw-r--r-- | rpmdb/rpmdb.h | 10 |
2 files changed, 8 insertions, 18 deletions
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index bfba6400e..6ae454351 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -802,7 +802,7 @@ int rpmdbClose(rpmdb db) if (db == NULL) goto exit; - (void) rpmdbUnlink(db, "rpmdbClose"); + (void) rpmdbUnlink(db, RPMDBG_M("rpmdbClose")); if (db->nrefs > 0) goto exit; @@ -918,7 +918,7 @@ rpmdb newRpmdb(const char * root, db->db_ndbi = dbiTagsMax; db->_dbi = xcalloc(db->db_ndbi, sizeof(*db->_dbi)); db->nrefs = 0; - return rpmdbLink(db, "rpmdbCreate"); + return rpmdbLink(db, RPMDBG_M("rpmdbCreate")); } static int openDatabase(const char * prefix, @@ -1010,19 +1010,19 @@ exit: return rc; } -rpmdb XrpmdbUnlink(rpmdb db, const char * msg, const char * fn, unsigned ln) +rpmdb rpmdbUnlink(rpmdb db, const char * msg) { if (_rpmdb_debug) -fprintf(stderr, "--> db %p -- %d %s at %s:%u\n", db, db->nrefs, msg, fn, ln); +fprintf(stderr, "--> db %p -- %d %s\n", db, db->nrefs, msg); db->nrefs--; return NULL; } -rpmdb XrpmdbLink(rpmdb db, const char * msg, const char * fn, unsigned ln) +rpmdb rpmdbLink(rpmdb db, const char * msg) { db->nrefs++; if (_rpmdb_debug) -fprintf(stderr, "--> db %p ++ %d %s at %s:%u\n", db, db->nrefs, msg, fn, ln); +fprintf(stderr, "--> db %p ++ %d %s\n", db, db->nrefs, msg); return db; } @@ -1560,7 +1560,7 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi) mi->mi_set = dbiFreeIndexSet(mi->mi_set); mi->mi_keyp = _free(mi->mi_keyp); - mi->mi_db = rpmdbUnlink(mi->mi_db, "matchIterator"); + mi->mi_db = rpmdbUnlink(mi->mi_db, RPMDBG_M("matchIterator")); mi = _free(mi); @@ -2389,7 +2389,7 @@ assert(keylen == sizeof(k->ui)); /* xxx programmer error */ mi->mi_keyp = mi_keyp; mi->mi_keylen = keylen; - mi->mi_db = rpmdbLink(db, "matchIterator"); + mi->mi_db = rpmdbLink(db, RPMDBG_M("matchIterator")); mi->mi_rpmtag = rpmtag; mi->mi_dbc = NULL; diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h index c55bc3658..9526133bd 100644 --- a/rpmdb/rpmdb.h +++ b/rpmdb/rpmdb.h @@ -56,11 +56,6 @@ int rpmdbSetChrootDone(rpmdb db, int chrootDone); */ rpmdb rpmdbUnlink (rpmdb db, const char * msg); -/** @todo Remove debugging entry from the ABI. */ -rpmdb XrpmdbUnlink (rpmdb db, const char * msg, - const char * fn, unsigned ln); -#define rpmdbUnlink(_db, _msg) XrpmdbUnlink(_db, _msg, __FILE__, __LINE__) - /** \ingroup rpmdb * Reference a database instance. * @param db rpm database @@ -69,11 +64,6 @@ rpmdb XrpmdbUnlink (rpmdb db, const char * msg, */ rpmdb rpmdbLink (rpmdb db, const char * msg); -/** @todo Remove debugging entry from the ABI. */ -rpmdb XrpmdbLink (rpmdb db, const char * msg, - const char * fn, unsigned ln); -#define rpmdbLink(_db, _msg) XrpmdbLink(_db, _msg, __FILE__, __LINE__) - /** \ingroup rpmdb * Open rpm database. * @param prefix path to top of install tree |