RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 29-Jun-2013 23:06:08
Branch: rpm-5_4 Handle: 2013062921060700
Modified files: (Branch: rpm-5_4)
rpm/rpmdb rpmdb.c
Log:
- sanity.
Summary:
Revision Changes Path
1.392.2.19 +2 -2 rpm/rpmdb/rpmdb.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.392.2.18 -r1.392.2.19 rpmdb.c
--- rpm/rpmdb/rpmdb.c 6 May 2012 21:32:42 -0000 1.392.2.18
+++ rpm/rpmdb/rpmdb.c 29 Jun 2013 21:06:07 -0000 1.392.2.19
@@ -1474,7 +1474,7 @@
av = argvFree(av);
b = _free(b);
mire = mireFree(mire);
-if (_rpmmi_debug || dbi->dbi_debug)
+if (_rpmmi_debug || (dbi && dbi->dbi_debug))
fprintf(stderr, "<-- %s(%p, %s(%u), %d, %p, %p, %p) rc %d %p[%u]\n",
__FUNCTION__, db, tagName(tag), (unsigned)tag, mode, pat, matches, argvp, ret,
(matches && *matches ? (*matches)->recs : NULL), (matches && *matches ?
(*matches)->count : 0));
return ret;
}
@@ -2549,7 +2549,7 @@
/* XXX FIXME: prints unprintable characters (while debugging). */
if (_rpmmi_debug || (dbi && dbi->dbi_debug))
-fprintf(stderr, "--> %s(%p, %s, %p[%u]=\"%s\") dbi %p mi %p\n",
__FUNCTION__, db, tagName(tag), keyp, (unsigned)keylen, (keylen == 0 || ((const
char *)keyp)[keylen] == '\0' ? (const char *)keyp : "???"), dbi, mi);
+fprintf(stderr, "--> %s(%p, %s, %p[%u]=\"%s\") dbi %p mi %p\n",
__FUNCTION__, db, tagName(tag), keyp, (unsigned)keylen, (keyp != NULL &&
(keylen == 0 || ((const char *)keyp)[keylen] == '\0') ? (const char *)keyp :
"???"), dbi, mi);
/* Chain cursors for teardown on abnormal exit. */
mi->mi_next = rpmmiRock;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
