RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 01-Aug-2007 19:58:38
Branch: HEAD Handle: 2007080118583403
Modified files:
rpm CHANGES system.h
rpm/lib cpio.c fsm.c rpmds.c rpmfc.c rpmgi.c rpmts.c tar.c
rpm/python rpmds-py.c rpmfts-py.c
rpm/rpmdb rpmdb.c sqlite.c
rpm/rpmio mire.c rpmdav.c
rpm/tools rpmdeps.c
Log:
- unsnarl __FUNCTION__ from system.h AutoFu.
Summary:
Revision Changes Path
1.1538 +1 -0 rpm/CHANGES
2.132 +2 -2 rpm/lib/cpio.c
2.127 +2 -2 rpm/lib/fsm.c
2.62 +6 -6 rpm/lib/rpmds.c
1.14 +1 -1 rpm/lib/rpmfc.c
2.31 +5 -5 rpm/lib/rpmgi.c
2.84 +1 -1 rpm/lib/rpmts.c
1.3 +5 -5 rpm/lib/tar.c
1.34 +2 -2 rpm/python/rpmds-py.c
1.16 +12 -12 rpm/python/rpmfts-py.c
1.145 +2 -2 rpm/rpmdb/rpmdb.c
1.13 +15 -15 rpm/rpmdb/sqlite.c
1.3 +5 -5 rpm/rpmio/mire.c
2.44 +4 -4 rpm/rpmio/rpmdav.c
2.78 +0 -9 rpm/system.h
2.11 +9 -7 rpm/tools/rpmdeps.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1537 -r1.1538 CHANGES
--- rpm/CHANGES 1 Aug 2007 15:55:28 -0000 1.1537
+++ rpm/CHANGES 1 Aug 2007 17:58:34 -0000 1.1538
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: unsnarl __FUNCTION__ from system.h AutoFu.
- rse: make sure RPM is also linked against libm if external Lua is used
(as liblua required libm)
- rse: support building against PCRE for its regcomp(3) emulation API
pcreposix(3) -- used by RPM internally
- rse: support building against PCRE for its native API pcre(3) -- used
by the Lua "rex" extension library
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/cpio.c
============================================================================
$ cvs diff -u -r2.131 -r2.132 cpio.c
--- rpm/lib/cpio.c 25 May 2007 17:36:02 -0000 2.131
+++ rpm/lib/cpio.c 1 Aug 2007 17:58:35 -0000 2.132
@@ -101,7 +101,7 @@
int rc = 0;
if (_cpio_debug)
-fprintf(stderr, " %s(%p, %p)\n", __FUNCTION__, fsm, st);
+fprintf(stderr, " cpioHeaderWrite(%p, %p)\n", fsm, st);
memcpy(hdr->magic, CPIO_NEWC_MAGIC, sizeof(hdr->magic));
SET_NUM_FIELD(hdr->inode, st->st_ino, field);
@@ -155,7 +155,7 @@
int rc = 0;
if (_cpio_debug)
-fprintf(stderr, " %s(%p, %p)\n", __FUNCTION__, fsm, st);
+fprintf(stderr, " cpioHeaderRead(%p, %p)\n", fsm, st);
fsm->wrlen = PHYS_HDR_SIZE;
rc = fsmNext(fsm, FSM_DREAD);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
============================================================================
$ cvs diff -u -r2.126 -r2.127 fsm.c
--- rpm/lib/fsm.c 30 Jul 2007 01:40:35 -0000 2.126
+++ rpm/lib/fsm.c 1 Aug 2007 17:58:35 -0000 2.127
@@ -568,7 +568,7 @@
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
if (_fsm_debug < 0)
-fprintf(stderr, "--> %s(%p, 0x%x, \"%s\", %p, %p, %p, %p, %p)\n",
__FUNCTION__, fsm, goal, afmt, (void *)ts, fi, cfd, archiveSize, failedFile);
+fprintf(stderr, "--> fsmSetup(%p, 0x%x, \"%s\", %p, %p, %p, %p, %p)\n", fsm,
goal, afmt, (void *)ts, fi, cfd, archiveSize, failedFile);
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
if (fsm->headerRead == NULL) {
@@ -643,7 +643,7 @@
int rc = fsm->rc;
if (_fsm_debug < 0)
-fprintf(stderr, "--> %s(%p)\n", __FUNCTION__, fsm);
+fprintf(stderr, "--> fsmTeardown(%p)\n", fsm);
if (!rc)
rc = fsmUNSAFE(fsm, FSM_DESTROY);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.61 -r2.62 rpmds.c
--- rpm/lib/rpmds.c 30 Jul 2007 01:40:35 -0000 2.61
+++ rpm/lib/rpmds.c 1 Aug 2007 17:58:35 -0000 2.62
@@ -2690,7 +2690,7 @@
/[EMAIL PROTECTED]@*/
if (_rpmds_debug < 0)
-fprintf(stderr, "*** %s(%p, %p) %s\n", __FUNCTION__, context, ds,
tagName(rpmdsTagN(ds)));
+fprintf(stderr, "*** rpmdsMergePRCO(%p, %p) %s\n", context, ds,
tagName(rpmdsTagN(ds)));
/[EMAIL PROTECTED]@*/
switch(rpmdsTagN(ds)) {
default:
@@ -2854,7 +2854,7 @@
/[EMAIL PROTECTED]@*/
if (_rpmds_debug < 0)
-fprintf(stderr, "*** %s(%s, %d, %p, %p)\n", __FUNCTION__, fn, flags, (void
*)add, context);
+fprintf(stderr, "*** rpmdsELF(%s, %d, %p, %p)\n", fn, flags, (void *)add,
context);
/[EMAIL PROTECTED]@*/
if (oneshot == 0) {
oneshot = 1;
@@ -3151,7 +3151,7 @@
/[EMAIL PROTECTED]@*/
if (_rpmds_debug < 0)
-fprintf(stderr, "*** %s(%p, %s) P %p R %p C %p O %p T %p D %p L %p\n",
__FUNCTION__, PRCO, fn, PRCO->Pdsp, PRCO->Rdsp, PRCO->Cdsp, PRCO->Odsp,
PRCO->Tdsp, PRCO->Ddsp, PRCO->Ldsp);
+fprintf(stderr, "*** rpmdsLdconfig(%p, %s) P %p R %p C %p O %p T %p D %p L
%p\n", PRCO, fn, PRCO->Pdsp, PRCO->Rdsp, PRCO->Cdsp, PRCO->Odsp, PRCO->Tdsp,
PRCO->Ddsp, PRCO->Ldsp);
fp = popen(_ldconfig_cmd, "r");
if (fp == NULL)
@@ -3275,7 +3275,7 @@
/[EMAIL PROTECTED]@*/
if (_rpmds_debug > 0)
-fprintf(stderr, "*** %s(%p, %s) P %p R %p C %p O %p\n", __FUNCTION__, PRCO,
rldp, PRCO->Pdsp, PRCO->Rdsp, PRCO->Cdsp, PRCO->Odsp);
+fprintf(stderr, "*** rpmdsRldpath(%p, %s) P %p R %p C %p O %p\n", PRCO,
rldp, PRCO->Pdsp, PRCO->Rdsp, PRCO->Cdsp, PRCO->Odsp);
f = rldp;
/* move through the path, splitting on : */
@@ -3303,14 +3303,14 @@
strcat(buf, "/*.so.*");
if (_rpmds_debug > 0)
-fprintf(stderr, "*** %s(%p, %s) globbing %s\n", __FUNCTION__, PRCO, rldp,
buf);
+fprintf(stderr, "*** rpmdsRldpath(%p, %s) globbing %s\n", PRCO, rldp, buf);
xx = glob(buf, 0, NULL, &gl);
if (xx) /* glob error, probably GLOB_NOMATCH */
continue;
if (_rpmds_debug > 0)
-fprintf(stderr, "*** %s(%p, %s) glob matched %d files\n", __FUNCTION__,
PRCO, rldp, gl.gl_pathc);
+fprintf(stderr, "*** rpmdsRldpath(%p, %s) glob matched %d files\n", PRCO,
rldp, gl.gl_pathc);
gp = gl.gl_pathv;
/* examine each match */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.13 -r1.14 rpmfc.c
--- rpm/lib/rpmfc.c 30 Jul 2007 01:40:35 -0000 1.13
+++ rpm/lib/rpmfc.c 1 Aug 2007 17:58:35 -0000 1.14
@@ -814,7 +814,7 @@
/[EMAIL PROTECTED]@*/
if (_rpmfc_debug < 0)
-fprintf(stderr, "*** %s(%p, %p) %s\n", __FUNCTION__, context, ds,
tagName(rpmdsTagN(ds)));
+fprintf(stderr, "*** rpmfcMergePR(%p, %p) %s\n", context, ds,
tagName(rpmdsTagN(ds)));
/[EMAIL PROTECTED]@*/
switch(rpmdsTagN(ds)) {
default:
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
============================================================================
$ cvs diff -u -r2.30 -r2.31 rpmgi.c
--- rpm/lib/rpmgi.c 30 Jul 2007 17:34:36 -0000 2.30
+++ rpm/lib/rpmgi.c 1 Aug 2007 17:58:35 -0000 2.31
@@ -479,9 +479,9 @@
return NULL;
if (gi->nrefs > 1)
- return rpmgiUnlink(gi, __FUNCTION__);
+ return rpmgiUnlink(gi, "rpmgiFree");
- (void) rpmgiUnlink(gi, __FUNCTION__);
+ (void) rpmgiUnlink(gi, "rpmgiFree");
/[EMAIL PROTECTED]@*/
@@ -519,7 +519,7 @@
if (gi == NULL)
return NULL;
- gi->ts = rpmtsLink(ts, __FUNCTION__);
+ gi->ts = rpmtsLink(ts, "rpmgiNew");
gi->tsOrder = rpmtsOrder;
gi->tag = tag;
/[EMAIL PROTECTED]@*/
@@ -543,7 +543,7 @@
gi->fts = NULL;
gi->walkPathFilter = NULL;
- gi = rpmgiLink(gi, __FUNCTION__);
+ gi = rpmgiLink(gi, "rpmgiNew");
return gi;
}
@@ -561,7 +561,7 @@
return rpmrc;
if (_rpmgi_debug)
-fprintf(stderr, "*** %s(%p) tag %s\n", __FUNCTION__, gi, tagName(gi->tag));
+fprintf(stderr, "*** rpmgiNext(%p) tag %s\n", gi, tagName(gi->tag));
/* Free header from previous iteration. */
gi->h = headerFree(gi->h);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.83 -r2.84 rpmts.c
--- rpm/lib/rpmts.c 30 Jul 2007 01:40:35 -0000 2.83
+++ rpm/lib/rpmts.c 1 Aug 2007 17:58:35 -0000 2.84
@@ -657,7 +657,7 @@
rpmps ps = NULL;
if (ts) {
if (ts->probs)
- ps = rpmpsLink(ts->probs, __FUNCTION__);
+ ps = rpmpsLink(ts->probs, "rpmtsProblems");
}
return ps;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/tar.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 tar.c
--- rpm/lib/tar.c 25 May 2007 18:34:13 -0000 1.2
+++ rpm/lib/tar.c 1 Aug 2007 17:58:35 -0000 1.3
@@ -103,7 +103,7 @@
int zblk = 0;
if (_tar_debug)
-fprintf(stderr, " %s(%p, %p)\n", __FUNCTION__, fsm, st);
+fprintf(stderr, " tarHeaderRead(%p, %p)\n", fsm, st);
top:
do {
@@ -277,7 +277,7 @@
int rc = 0;
if (_tar_debug)
-fprintf(stderr, "\t%s(%p, %s) nb %d\n", __FUNCTION__, fsm, path, nb);
+fprintf(stderr, "\ttarHeaderWriteName(%p, %s) nb %d\n", fsm, path, nb);
while (nb > 0) {
memset(fsm->rdbuf, 0, TAR_BLOCK_SIZE);
@@ -314,7 +314,7 @@
int rc;
if (_tar_debug)
-fprintf(stderr, "\t%s(%p, %p) type %c\n", __FUNCTION__, fsm, hdr,
hdr->typeflag);
+fprintf(stderr, "\ttarHeaderWriteBlock(%p, %p) type %c\n", fsm, hdr,
hdr->typeflag);
if (_tar_debug)
fprintf(stderr, "\t %06o%3d (%4d,%4d)%10d %s\n",
(unsigned)st->st_mode, (int)st->st_nlink,
@@ -357,7 +357,7 @@
int len;
if (_tar_debug)
-fprintf(stderr, " %s(%p, %p)\n", __FUNCTION__, fsm, st);
+fprintf(stderr, " tarHeaderWrite(%p, %p)\n", fsm, st);
len = strlen(fsm->path);
if (len > sizeof(hdr->name)) {
@@ -457,7 +457,7 @@
int rc = 0;
if (_tar_debug)
-fprintf(stderr, " %s(%p)\n", __FUNCTION__, fsm);
+fprintf(stderr, " tarTrailerWrite(%p)\n", fsm);
/* Pad up to 20 blocks (10Kb) of zeroes. */
fsm->blksize *= 20;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmds-py.c
============================================================================
$ cvs diff -u -r1.33 -r1.34 rpmds-py.c
--- rpm/python/rpmds-py.c 20 Jul 2007 22:47:34 -0000 1.33
+++ rpm/python/rpmds-py.c 1 Aug 2007 17:58:36 -0000 1.34
@@ -433,7 +433,7 @@
/* XXX check return code, permit arg (NULL uses system default). */
xx = rpmdsSysinfo(PRCO, NULL);
- P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), __FUNCTION__);
+ P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), "rpmds_Sysinfo");
PRCO = rpmdsFreePRCO(PRCO);
return (PyObject *) rpmds_Wrap( P );
@@ -463,7 +463,7 @@
/* XXX check return code, permit arg (NULL uses system default). */
xx = rpmdsLdconfig(PRCO, NULL);
- P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), __FUNCTION__);
+ P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), "rpmds_Ldconfig");
PRCO = rpmdsFreePRCO(PRCO);
return (PyObject *) rpmds_Wrap( P );
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmfts-py.c
============================================================================
$ cvs diff -u -r1.15 -r1.16 rpmfts-py.c
--- rpm/python/rpmfts-py.c 25 May 2007 17:36:31 -0000 1.15
+++ rpm/python/rpmfts-py.c 1 Aug 2007 17:58:36 -0000 1.16
@@ -109,7 +109,7 @@
{
int rc = 0;
-rpmfts_debug(__FUNCTION__, s);
+rpmfts_debug("rpmfts_state", s);
switch (nactive) {
case RPMFTS_CLOSE:
if (s->ftsp != NULL) {
@@ -141,7 +141,7 @@
PyObject * result = NULL;
int xx;
-rpmfts_debug(__FUNCTION__, s);
+rpmfts_debug("rpmfts_step", s);
if (s->ftsp == NULL)
return NULL;
@@ -203,7 +203,7 @@
/* XXX: there's bound to be a better name than "ignore" */
char * kwlist[] = {"root", "options", "ignore", NULL};
-rpmfts_debug(__FUNCTION__, s);
+rpmfts_debug("rpmfts_Open", s);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|sii:Open", kwlist,
&root, &options, &ignore))
return NULL;
@@ -222,7 +222,7 @@
{
PyObject * result;
-rpmfts_debug(__FUNCTION__, s);
+rpmfts_debug("rpmfts_Read", s);
result = rpmfts_step(s);
@@ -243,7 +243,7 @@
int instr;
char * kwlist[] = {"instructions", NULL};
-rpmfts_debug(__FUNCTION__, s);
+rpmfts_debug("rpmfts_Children", s);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "i:Children", kwlist,
&instr))
return NULL;
@@ -264,7 +264,7 @@
/[EMAIL PROTECTED] s @*/
{
-rpmfts_debug(__FUNCTION__, s);
+rpmfts_debug("rpmfts_Close", s);
return Py_BuildValue("i", rpmfts_state(s, RPMFTS_CLOSE));
}
@@ -278,7 +278,7 @@
int rc = 0;
char * kwlist[] = {"instructions", NULL};
-rpmfts_debug(__FUNCTION__, s);
+rpmfts_debug("rpmfts_Set", s);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "i:Set", kwlist, &instr))
return NULL;
@@ -327,14 +327,14 @@
static PyObject * rpmfts_getattro(PyObject * o, PyObject * n)
/[EMAIL PROTECTED]/
{
-rpmfts_debug(__FUNCTION__, (rpmftsObject *)o);
+rpmfts_debug("rpmfts_getattro", (rpmftsObject *)o);
return PyObject_GenericGetAttr(o, n);
}
static int rpmfts_setattro(PyObject * o, PyObject * n, PyObject * v)
/[EMAIL PROTECTED]/
{
-rpmfts_debug(__FUNCTION__, (rpmftsObject *)o);
+rpmfts_debug("rpmfts_setattro", (rpmftsObject *)o);
return PyObject_GenericSetAttr(o, n, v);
}
@@ -380,7 +380,7 @@
{
int xx;
-rpmfts_debug(__FUNCTION__, s);
+rpmfts_debug("rpmfts_dealloc", s);
xx = rpmfts_state(s, RPMFTS_CLOSE);
s->roots = _free(s->roots);
@@ -405,7 +405,7 @@
int ignore = -1;
char * kwlist[] = {"root", "options", "ignore", NULL};
-rpmfts_debug(__FUNCTION__, s);
+rpmfts_debug("rpmfts_init", s);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|sii:rpmfts_init", kwlist,
&root, &options, &ignore))
return -1;
@@ -428,7 +428,7 @@
if ((s = PyObject_GC_New(rpmftsObject, type)) == NULL)
return NULL;
-rpmfts_debug(__FUNCTION__, s);
+rpmfts_debug("rpmfts_new", s);
s->md_dict = PyDict_New();
if (s->md_dict == NULL)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.144 -r1.145 rpmdb.c
--- rpm/rpmdb/rpmdb.c 30 Jul 2007 17:34:37 -0000 1.144
+++ rpm/rpmdb/rpmdb.c 1 Aug 2007 17:58:37 -0000 1.145
@@ -281,7 +281,7 @@
/[EMAIL PROTECTED]@*/
if (_rpmdb_debug)
-fprintf(stderr, "==> %s(%p, %s, 0x%x)\n", __FUNCTION__, db, tagName(rpmtag),
flags);
+fprintf(stderr, "==> dbiOpen(%p, %s, 0x%x)\n", db, tagName(rpmtag), flags);
/[EMAIL PROTECTED]@*/
if (db == NULL)
@@ -1090,7 +1090,7 @@
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
if (_rpmdb_debug)
-fprintf(stderr, "==> %s(%s, %s, 0x%x, 0%o, 0x%x) db %p\n", __FUNCTION__,
root, home, mode, perms, flags, db);
+fprintf(stderr, "==> rpmdbNew(%s, %s, 0x%x, 0%o, 0x%x) db %p\n", root, home,
mode, perms, flags, db);
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
if (!oneshot) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/sqlite.c
============================================================================
$ cvs diff -u -r1.12 -r1.13 sqlite.c
--- rpm/rpmdb/sqlite.c 30 Jul 2007 12:30:54 -0000 1.12
+++ rpm/rpmdb/sqlite.c 1 Aug 2007 17:58:37 -0000 1.13
@@ -219,7 +219,7 @@
int ix;
if (_debug)
-fprintf(stderr, "*** %s(%p)\n", __FUNCTION__, scp);
+fprintf(stderr, "*** scpResetKeys(%p)\n", scp);
dbg_scp(scp);
for ( ix =0 ; ix < scp->nkeys ; ix++ ) {
@@ -241,7 +241,7 @@
int xx;
if (_debug)
-fprintf(stderr, "*** %s(%p)\n", __FUNCTION__, scp);
+fprintf(stderr, "*** scpResetAv(%p)\n", scp);
dbg_scp(scp);
if (scp->av != NULL) {
@@ -280,7 +280,7 @@
int xx;
if (_debug)
-fprintf(stderr, "*** %s(%p)\n", __FUNCTION__, scp);
+fprintf(stderr, "*** scpReset(%p)\n", scp);
dbg_scp(scp);
if (scp->cmd) {
@@ -311,7 +311,7 @@
scp->avlen = _free(scp->avlen);
if (_debug)
-fprintf(stderr, "*** %s(%p)\n", __FUNCTION__, scp);
+fprintf(stderr, "*** scpFree(%p)\n", scp);
scp = _free(scp);
return NULL;
}
@@ -330,7 +330,7 @@
scp->ldata = NULL;
if (_debug)
-fprintf(stderr, "*** %s(%p)\n", __FUNCTION__, scp);
+fprintf(stderr, "*** scpNew(%p)\n", scp);
return scp;
}
@@ -813,7 +813,7 @@
int rc;
if (_debug)
-fprintf(stderr, "==> %s(%p)\n", __FUNCTION__, scp);
+fprintf(stderr, "==> sql_cclose(%p)\n", scp);
if (scp->lkey)
scp->lkey = _free(scp->lkey);
@@ -1065,7 +1065,7 @@
int rc = 0;
if (_debug)
-fprintf(stderr, "==> %s(%s) tag %d type %d scp %p\n", __FUNCTION__,
tagName(dbi->dbi_rpmtag), dbi->dbi_rpmtag, (tagType(dbi->dbi_rpmtag) &
RPM_MASK_TYPE), scp);
+fprintf(stderr, "==> sql_copen(%s) tag %d type %d scp %p\n",
tagName(dbi->dbi_rpmtag), dbi->dbi_rpmtag, (tagType(dbi->dbi_rpmtag) &
RPM_MASK_TYPE), scp);
enterChroot(dbi);
@@ -1101,7 +1101,7 @@
SCP_t scp = scpNew(dbi->dbi_db);
int rc = 0;
-dbg_keyval(__FUNCTION__, dbi, dbcursor, key, data, flags);
+dbg_keyval("sql_cdel", dbi, dbcursor, key, data, flags);
enterChroot(dbi);
scp->cmd = sqlite3_mprintf("DELETE FROM '%q' WHERE key=? AND value=?;",
@@ -1144,7 +1144,7 @@
int ix;
assert(dbcursor != NULL);
-dbg_keyval(__FUNCTION__, dbi, dbcursor, key, data, flags);
+dbg_keyval("sql_cget", dbi, dbcursor, key, data, flags);
enterChroot(dbi);
@@ -1322,7 +1322,7 @@
SCP_t scp = scpNew(dbi->dbi_db);
int rc = 0;
-dbg_keyval(__FUNCTION__, dbi, dbcursor, key, data, flags);
+dbg_keyval("sql_cput", dbi, dbcursor, key, data, flags);
enterChroot(dbi);
@@ -1416,7 +1416,7 @@
/[EMAIL PROTECTED]/
{
if (_debug)
-fprintf(stderr, "*** %s:\n", __FUNCTION__);
+fprintf(stderr, "*** sql_associate:\n");
return EINVAL;
}
@@ -1434,7 +1434,7 @@
/[EMAIL PROTECTED] dbi, *dbcp, fileSystem @*/
{
if (_debug)
-fprintf(stderr, "*** %s:\n", __FUNCTION__);
+fprintf(stderr, "*** sql_join:\n");
return EINVAL;
}
@@ -1452,7 +1452,7 @@
/[EMAIL PROTECTED] dbi, *dbcp, fileSystem @*/
{
if (_debug)
-fprintf(stderr, "*** %s:\n", __FUNCTION__);
+fprintf(stderr, "*** sql_cdup:\n");
return EINVAL;
}
@@ -1472,7 +1472,7 @@
/[EMAIL PROTECTED] *dbcursor, *key, *pkey, *data, fileSystem @*/
{
if (_debug)
-fprintf(stderr, "*** %s:\n", __FUNCTION__);
+fprintf(stderr, "*** sql_cpget:\n");
return EINVAL;
}
@@ -1491,7 +1491,7 @@
/[EMAIL PROTECTED] *dbcursor, fileSystem @*/
{
if (_debug)
-fprintf(stderr, "*** %s:\n", __FUNCTION__);
+fprintf(stderr, "*** sql_ccount:\n");
return EINVAL;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/mire.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 mire.c
--- rpm/rpmio/mire.c 25 May 2007 18:34:14 -0000 1.2
+++ rpm/rpmio/mire.c 1 Aug 2007 17:58:37 -0000 1.3
@@ -30,7 +30,7 @@
{
/[EMAIL PROTECTED]@*/
if (_mire_debug)
-fprintf(stderr, "--> %s(%p)\n", __FUNCTION__, mire);
+fprintf(stderr, "--> mireClean(%p)\n", mire);
/[EMAIL PROTECTED]@*/
mire->pattern = _free(mire->pattern);
if (mire->preg != NULL) {
@@ -47,7 +47,7 @@
{
/[EMAIL PROTECTED]@*/
if (_mire_debug)
-fprintf(stderr, "--> %s(%p)\n", __FUNCTION__, mire);
+fprintf(stderr, "--> mireFree(%p)\n", mire);
/[EMAIL PROTECTED]@*/
(void) mireClean(mire);
mire = _free(mire);
@@ -61,7 +61,7 @@
mire->tag = tag;
/[EMAIL PROTECTED]@*/
if (_mire_debug)
-fprintf(stderr, "--> %s(%d, %d) mire %p\n", __FUNCTION__, mode, tag, mire);
+fprintf(stderr, "--> mireNew(%d, %d) mire %p\n", mode, tag, mire);
/[EMAIL PROTECTED]@*/
return mire;
}
@@ -101,7 +101,7 @@
/[EMAIL PROTECTED]@*/
if (_mire_debug)
-fprintf(stderr, "--> %s(%p, \"%s\") rc %d\n", __FUNCTION__, mire, val, rc);
+fprintf(stderr, "--> mireRegexec(%p, \"%s\") rc %d\n", mire, val, rc);
/[EMAIL PROTECTED]@*/
return rc;
}
@@ -147,7 +147,7 @@
/[EMAIL PROTECTED]@*/
if (_mire_debug)
-fprintf(stderr, "--> %s(%p, \"%s\") rc %d\n", __FUNCTION__, mire, pattern,
rc);
+fprintf(stderr, "--> mireRegcomp(%p, \"%s\") rc %d\n", mire, pattern, rc);
/[EMAIL PROTECTED]@*/
return rc;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.c
============================================================================
$ cvs diff -u -r2.43 -r2.44 rpmdav.c
--- rpm/rpmio/rpmdav.c 25 Jul 2007 16:48:07 -0000 2.43
+++ rpm/rpmio/rpmdav.c 1 Aug 2007 17:58:37 -0000 2.44
@@ -401,7 +401,7 @@
exit:
/[EMAIL PROTECTED]@*/
if (uret != NULL)
- *uret = urlLink(u, __FUNCTION__);
+ *uret = urlLink(u, "davInit");
/[EMAIL PROTECTED]@*/
u = urlFree(u, "urlSplit (davInit)");
@@ -498,7 +498,7 @@
ctx->modes = _free(ctx->modes);
ctx->sizes = _free(ctx->sizes);
ctx->mtimes = _free(ctx->mtimes);
- ctx->u = urlFree(ctx->u, __FUNCTION__);
+ ctx->u = urlFree(ctx->u, "fetch_destroy_context");
ctx->uri = _free(ctx->uri);
/[EMAIL PROTECTED]@*/
memset(ctx, 0, sizeof(*ctx));
@@ -522,7 +522,7 @@
ctx = ne_calloc(sizeof(*ctx));
ctx->uri = xstrdup(uri);
- ctx->u = urlLink(u, __FUNCTION__);
+ ctx->u = urlLink(u, "fetch_create_context");
if ((ctx->st = st) != NULL)
memset(ctx->st, 0, sizeof(*ctx->st));
return ctx;
@@ -1410,7 +1410,7 @@
/* HACK: neon really wants collections with trailing '/' */
ctx = fetch_create_context(path, st);
if (ctx == NULL) {
-fprintf(stderr, "==> %s fetch_create_context ctx %p\n", __FUNCTION__, ctx);
+fprintf(stderr, "==> %s fetch_create_context ctx %p\n", "davStat", ctx);
/* HACK: errno = ??? */
goto exit;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/system.h
============================================================================
$ cvs diff -u -r2.77 -r2.78 system.h
--- rpm/system.h 1 Aug 2007 16:00:36 -0000 2.77
+++ rpm/system.h 1 Aug 2007 17:58:34 -0000 2.78
@@ -705,15 +705,6 @@
}
#endif
-/* provide fallback definition for GCC function name symbol */
-#if !(defined(__GNUC__) && __GNUC__ >= 2)
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#define __FUNCTION__ __func__
-#else
-#define __FUNCTION__ "<unknown>"
-#endif
-#endif
-
#if defined(HAVE_SEARCH_H)
#include <search.h>
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmdeps.c
============================================================================
$ cvs diff -u -r2.10 -r2.11 rpmdeps.c
--- rpm/tools/rpmdeps.c 16 Jul 2007 01:32:33 -0000 2.10
+++ rpm/tools/rpmdeps.c 1 Aug 2007 17:58:37 -0000 2.11
@@ -215,9 +215,11 @@
POPT_TABLEEND
};
+
int
main(int argc, char *const argv[])
{
+static const char rpmdeps_string[] = "rpmdeps";
poptContext optCon;
ARGV_t av = NULL;
rpmfc fc = NULL;
@@ -288,8 +290,8 @@
break;
case RPMDEP_RPMDSSYSINFO:
xx = rpmdsSysinfo(PRCO, NULL);
- P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), __FUNCTION__);
- R = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_REQUIRENAME), __FUNCTION__);
+ P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), rpmdeps_string);
+ R = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_REQUIRENAME), rpmdeps_string);
break;
case RPMDEP_RPMDSGETCONF:
closure_name = "getconf(...)";
@@ -299,14 +301,14 @@
closure_name = "soname(...)";
for (i = 0; i < ac; i++)
xx = rpmdsELF(av[i], flags, rpmdsMergePRCO, PRCO);
- P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), __FUNCTION__);
- R = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_REQUIRENAME), __FUNCTION__);
+ P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), rpmdeps_string);
+ R = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_REQUIRENAME), rpmdeps_string);
break;
case RPMDEP_RPMDSLDCONFIG:
closure_name = "soname(...)";
xx = rpmdsLdconfig(PRCO, NULL);
- P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), __FUNCTION__);
- R = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_REQUIRENAME), __FUNCTION__);
+ P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), rpmdeps_string);
+ R = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_REQUIRENAME), rpmdeps_string);
break;
case RPMDEP_RPMDSUNAME:
closure_name = "uname(...)";
@@ -363,7 +365,7 @@
case RPMDEP_RPMDSSONAME:
closure_name = "soname(...)";
xx = rpmdsLdconfig(PRCO, NULL);
- P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), __FUNCTION__);
+ P = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), rpmdeps_string);
if (print_closure || rpmIsVerbose()) {
fprintf(stderr, "\n*** Gathering rpmdb soname Requires: using\n\t%s\n",
_rpmdb_soname_requires);
xx = rpmdsPipe(&R, RPMTAG_REQUIRENAME, _rpmdb_soname_requires);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
