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: 14-Jul-2017 13:40:16 Branch: rpm-5_4 Handle: 2017071411401600 Modified files: (Branch: rpm-5_4) rpm/rpmdb pkgio.c Log: - use macro __VA_ARGS__ Summary: Revision Changes Path 1.121.2.30 +30 -43 rpm/rpmdb/pkgio.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmdb/pkgio.c ============================================================================ $ cvs diff -u -r1.121.2.29 -r1.121.2.30 pkgio.c --- rpm/rpmdb/pkgio.c 16 May 2017 20:11:41 -0000 1.121.2.29 +++ rpm/rpmdb/pkgio.c 14 Jul 2017 11:40:16 -0000 1.121.2.30 @@ -41,7 +41,15 @@ GENfree(rpmuint32_t *) #endif /* __cplusplus */ -int _pkgio_debug = 0; +int _pkgio_debug; +#define SPEW(_fmt, ...) \ + if (_pkgio_debug) \ + fprintf(stderr, _fmt, __VA_ARGS__) + +extern int _rpmhkp_debug; +#define HKPSPEW(_fmt, ...) \ + if (_rpmhkp_debug) \ + fprintf(stderr, _fmt, __VA_ARGS__) /** */ @@ -64,8 +72,7 @@ size_t length; rpmRC rc = RPMRC_FAIL; /* assume failure */ -if (_pkgio_debug) -fprintf(stderr, "--> rpmWriteHeader(%p, %p, %p)\n", fd, h, msg); +SPEW("--> rpmWriteHeader(%p, %p, %p)\n", fd, h, msg); if (h == NULL) { if (msg) @@ -159,8 +166,7 @@ int validate = 0; int xx; -if (_rpmhkp_debug) -fprintf(stderr, "--> %s(%p,%p)\n", __FUNCTION__, ts, _dig); +SPEW("--> %s(%p,%p)\n", __FUNCTION__, ts, _dig); assert(dig != NULL); assert(sigp != NULL); @@ -172,8 +178,7 @@ awol = rpmbfLink(hkp->awol); #if 0 -if (_rpmhkp_debug) -fprintf(stderr, "==> find sig id %08x %08x ts pubkey id %08x %08x\n", +HKPSPEW("==> find sig id %08x %08x ts pubkey id %08x %08x\n", pgpGrab(sigp->signid, 4), pgpGrab(sigp->signid+4, 4), pgpGrab(hkp->signid, 4), pgpGrab(hkp->signid+4, 4)); #endif @@ -181,8 +186,7 @@ /* Lazy free of previous pubkey if pubkey does not match this signature. */ if (memcmp(sigp->signid, hkp->signid, sizeof(hkp->signid))) { #if 0 -if (_rpmhkp_debug) -fprintf(stderr, "*** free pkt %p[%d] id %08x %08x\n", hkp->pkt, hkp->pktlen, pgpGrab(hkp->signid, 4), pgpGrab(hkp->signid+4, 4)); +HKPSPEW("*** free pkt %p[%d] id %08x %08x\n", hkp->pkt, hkp->pktlen, pgpGrab(hkp->signid, 4), pgpGrab(hkp->signid+4, 4)); #endif hkp->pkt = _free(hkp->pkt); hkp->pktlen = 0; @@ -213,8 +217,7 @@ validate = 0; break; } -if (_rpmhkp_debug) -fprintf(stderr, "\t%s: rpmku %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); +HKPSPEW("\t%s: rpmku %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); } /* Try rpmdb keyring lookup. */ @@ -265,8 +268,7 @@ hkp->pkt = _free(hkp->pkt); hkp->pktlen = 0; } -if (_rpmhkp_debug) -fprintf(stderr, "\t%s: rpmdb %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); +HKPSPEW("\t%s: rpmdb %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); } /* Try autosign package pubkey (if present). */ @@ -279,8 +281,7 @@ hkp->pktlen = dig->publen; dig->publen = 0; pubkeysource = xstrdup("package"); validate = -1; /* XXX rpmhkpValidate is prerequisite for rpmhkpFindKey */ -if (_rpmhkp_debug) -fprintf(stderr, "\t%s: auto %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); +HKPSPEW("\t%s: auto %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); } } @@ -301,8 +302,7 @@ pubkeysource = xstrdup("keyserver"); validate = 1; } -if (_rpmhkp_debug) -fprintf(stderr, "\t%s: rpmhkp %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); +HKPSPEW("\t%s: rpmhkp %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); } #ifdef NOTYET @@ -326,8 +326,7 @@ /* Was a matching pubkey found? */ if (hkp->pkt == NULL || hkp->pktlen == 0) goto exit; -if (_rpmhkp_debug) -fprintf(stderr, "\t%s: match %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); +HKPSPEW("\t%s: match %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); /* Split the result into packet array. */ hkp->pkts = _free(hkp->pkts); /* XXX memleaks */ @@ -353,8 +352,7 @@ case RPMRC_FAIL: /* XXX remap to NOTFOUND? */ case RPMRC_NOTTRUSTED: default: -if (_rpmhkp_debug) -fprintf(stderr, "*** rpmhkpValidate: validate %d rc %d\n", validate, rc); +HKPSPEW("*** rpmhkpValidate: validate %d rc %d\n", validate, rc); res = rc; goto exit; } @@ -380,8 +378,7 @@ iob->b = (rpmuint8_t *)memcpy(iob->b, hkp->pkt, iob->blen); } (void) rpmkuStorePubkey(sigp, iob); -if (_rpmhkp_debug) -fprintf(stderr, "\t%s: rpmku %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); +HKPSPEW("\t%s: rpmku %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); } /* Pubkey packet looks good, save the signer id. */ @@ -410,8 +407,7 @@ (void) rpmbfFree(awol); (void) rpmhkpFree(hkp); -if (_rpmhkp_debug) -fprintf(stderr, "<-- %s(%p,%p) res %d\n", __FUNCTION__, ts, _dig, res); +HKPSPEW("<-- %s(%p,%p) res %d\n", __FUNCTION__, ts, _dig, res); return res; } @@ -475,8 +471,7 @@ { struct rpmlead l = {}; -if (_pkgio_debug) -fprintf(stderr, "--> wrLead(%p, %p, %p)\n", fd, ptr, msg); +SPEW("--> wrLead(%p, %p, %p)\n", fd, ptr, msg); if (ptr) memcpy(&l, ptr, sizeof(l)); @@ -519,8 +514,7 @@ rpmRC rc = rc_fail; /* assume failure */ int xx; -if (_pkgio_debug) -fprintf(stderr, "--> rdLead(%p, %p, %p)\n", fd, ptr, msg); +SPEW("--> rdLead(%p, %p, %p)\n", fd, ptr, msg); buf[0] = '\0'; if (leadp != NULL) *leadp = NULL; @@ -646,8 +640,7 @@ size_t pad; rpmRC rc = RPMRC_OK; -if (_pkgio_debug) -fprintf(stderr, "--> wrSignature(%p, %p, %p)\n", fd, ptr, msg); +SPEW("--> wrSignature(%p, %p, %p)\n", fd, ptr, msg); rc = rpmWriteHeader(fd, sigh, msg); if (rc != RPMRC_OK) @@ -787,8 +780,7 @@ pgpPkt pp = (pgpPkt) alloca(sizeof(*pp)); rpmuint32_t rtag = 0; /* assume no region tag. */ -if (_pkgio_debug) -fprintf(stderr, "--> rdSignature(%p, %p, %p) dig %p\n", fd, ptr, msg, dig); +SPEW("--> rdSignature(%p, %p, %p) dig %p\n", fd, ptr, msg, dig); buf[0] = '\0'; if (sighp) @@ -1252,8 +1244,7 @@ *msg = xstrdup(buf); } -if (_pkgio_debug) -fprintf(stderr, "<-- rdSignature(%p, %p, %p) rc %d \"%s\"\n", fd, ptr, msg, rc, *msg); +SPEW("<-- rdSignature(%p, %p, %p) rc %d \"%s\"\n", fd, ptr, msg, rc, *msg); return rc; } @@ -1436,8 +1427,7 @@ rpmuint32_t i; pgpPkt pp = (pgpPkt) alloca(sizeof(*pp)); -if (_pkgio_debug) -fprintf(stderr, "--> headerCheck(%p, %p[%u], %p)\n", dig, uh, (unsigned) uc, msg); +SPEW("--> headerCheck(%p, %p[%u], %p)\n", dig, uh, (unsigned) uc, msg); buf[0] = '\0'; @@ -1675,8 +1665,7 @@ buf[sizeof(buf)-1] = '\0'; if (msg) *msg = xstrdup(buf); -if (_pkgio_debug) -fprintf(stderr, "<-- headerCheck#3: rc %d \"%s\"\n", rc, (msg ? *msg: "")); +SPEW("<-- headerCheck#3: rc %d \"%s\"\n", rc, (msg ? *msg: "")); return rc; } @@ -1741,8 +1730,7 @@ static int map = 1; struct stat sb, *st = &sb; -if (_pkgio_debug) -fprintf(stderr, "--> rpmReadHeader(%p, %p, %p)\n", fd, hdrp, msg); +SPEW("--> rpmReadHeader(%p, %p, %p)\n", fd, hdrp, msg); /* Create (if not already) a signature parameters container. */ if (dig == NULL) { @@ -1924,8 +1912,7 @@ *msg = xstrdup(buf); } -if (_pkgio_debug) -fprintf(stderr, "<-- rpmReadHeader: rc %d \"%s\"\n", rc, (msg ? *msg: "")); +SPEW("<-- rpmReadHeader: rc %d \"%s\"\n", rc, (msg ? *msg: "")); return rc; } @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
