folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lose the useless rpmps refcounting debug junk 

- get the debug messages out of API, this is what should've been in commit
  dbdbe8010c
This commit is contained in:
Panu Matilainen 2010-03-22 12:54:44 +02:00
parent c586c9955c
commit 9672e12a22
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/poptALL.c
View File

@ -46,8 +46,6 @@ extern int _rpmds_debug;
/* XXX avoid -lrpmbuild linkage. */ /* XXX avoid -lrpmbuild linkage. */
int _rpmfc_debug; int _rpmfc_debug;
extern int _rpmps_debug;
extern int _rpmsq_debug; extern int _rpmsq_debug;
extern int _rpmte_debug; extern int _rpmte_debug;
@ -236,8 +234,6 @@ struct poptOption rpmcliAllPoptTable[] = {
NULL, NULL}, NULL, NULL},
{ "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug, -1, { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug, -1,
N_("debug rpmio I/O"), NULL}, N_("debug rpmio I/O"), NULL},
{ "rpmpsdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmps_debug, -1,
NULL, NULL},
{ "rpmsqdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmsq_debug, -1, { "rpmsqdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmsq_debug, -1,
NULL, NULL}, NULL, NULL},
{ "rpmtedebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmte_debug, -1, { "rpmtedebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmte_debug, -1,

14
lib/rpmps.c
View File

@ -40,9 +40,7 @@ struct rpmpsi_s {
}; };
int _rpmps_debug = 0; rpmps rpmpsUnlink(rpmps ps)
rpmps rpmpsUnlink(rpmps ps, const char * msg)
{ {
if (ps) { if (ps) {
ps->nrefs--; ps->nrefs--;
@ -50,7 +48,7 @@ rpmps rpmpsUnlink(rpmps ps, const char * msg)
return NULL; return NULL;
} }
rpmps rpmpsLink(rpmps ps, const char * msg) rpmps rpmpsLink(rpmps ps)
{ {
if (ps) { if (ps) {
ps->nrefs++; ps->nrefs++;
@ -71,7 +69,7 @@ rpmpsi rpmpsInitIterator(rpmps ps)
rpmpsi psi = NULL; rpmpsi psi = NULL;
if (ps != NULL) { if (ps != NULL) {
psi = xcalloc(1, sizeof(*psi)); psi = xcalloc(1, sizeof(*psi));
psi->ps = rpmpsLink(ps, RPMDBG_M("rpmpsInitIterator")); psi->ps = rpmpsLink(ps);
psi->ix = -1; psi->ix = -1;
} }
return psi; return psi;
@ -80,7 +78,7 @@ rpmpsi rpmpsInitIterator(rpmps ps)
rpmpsi rpmpsFreeIterator(rpmpsi psi) rpmpsi rpmpsFreeIterator(rpmpsi psi)
{ {
if (psi != NULL) { if (psi != NULL) {
rpmpsUnlink(psi->ps, RPMDBG_M("rpmpsFreeIterator")); rpmpsUnlink(psi->ps);
free(psi); free(psi);
psi = NULL; psi = NULL;
} }
@ -113,14 +111,14 @@ rpmProblem rpmpsGetProblem(rpmpsi psi)
rpmps rpmpsCreate(void) rpmps rpmpsCreate(void)
{ {
rpmps ps = xcalloc(1, sizeof(*ps)); rpmps ps = xcalloc(1, sizeof(*ps));
return rpmpsLink(ps, RPMDBG_M("rpmpsCreate")); return rpmpsLink(ps);
} }
rpmps rpmpsFree(rpmps ps) rpmps rpmpsFree(rpmps ps)
{ {
if (ps == NULL) return NULL; if (ps == NULL) return NULL;
if (ps->nrefs > 1) { if (ps->nrefs > 1) {
return rpmpsUnlink(ps, RPMDBG_M("rpmpsFree")); return rpmpsUnlink(ps);
} }
if (ps->probs) { if (ps->probs) {

9
lib/rpmps.h
View File

@ -13,8 +13,6 @@
extern "C" { extern "C" {
#endif #endif
extern int _rpmps_debug;
/** \ingroup rpmps /** \ingroup rpmps
* @todo Generalize filter mechanism. * @todo Generalize filter mechanism.
*/ */
@ -153,19 +151,16 @@ char * rpmProblemString(const rpmProblem prob);
/** \ingroup rpmps /** \ingroup rpmps
* Unreference a problem set instance. * Unreference a problem set instance.
* @param ps problem set * @param ps problem set
* @param msg
* @return problem set * @return problem set
*/ */
rpmps rpmpsUnlink (rpmps ps, rpmps rpmpsUnlink (rpmps ps);
const char * msg);
/** \ingroup rpmps /** \ingroup rpmps
* Reference a problem set instance. * Reference a problem set instance.
* @param ps transaction set * @param ps transaction set
* @param msg
* @return new transaction set reference * @return new transaction set reference
*/ */
rpmps rpmpsLink (rpmps ps, const char * msg); rpmps rpmpsLink (rpmps ps);
/** \ingroup rpmps /** \ingroup rpmps
* Return number of problems in set. * Return number of problems in set.

2
lib/rpmte.c
View File

@ -708,7 +708,7 @@ int rpmteHaveTransScript(rpmte te, rpmTag tag)
rpmps rpmteProblems(rpmte te) rpmps rpmteProblems(rpmte te)
{ {
return (te != NULL) ? rpmpsLink(te->probs, RPMDBG_M("rpmteProbs")) : NULL; return (te != NULL) ? rpmpsLink(te->probs) : NULL;
} }
void rpmteCleanProblems(rpmte te) void rpmteCleanProblems(rpmte te)