From 1e4e1a4bee41dee73b72ff93c2b7e9a5513bd030 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 23 May 2008 13:01:47 +0300 Subject: [PATCH] Convert getSignid() to new headerGet() --- lib/rpmchecksig.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 5a31962..cf6e581 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -111,22 +111,20 @@ exit: */ static int getSignid(Header sig, rpmSigTag sigtag, pgpKeyID_t signid) { - rpm_data_t pkt = NULL; - rpmTagType pkttyp = 0; - rpm_count_t pktlen = 0; + struct rpmtd_s pkt; int rc = 1; - if (headerGetEntry(sig, sigtag, &pkttyp, &pkt, &pktlen) && pkt != NULL) { + if (headerGet(sig, sigtag, &pkt, HEADERGET_DEFAULT) && pkt.data != NULL) { pgpDig dig = pgpNewDig(); - if (!pgpPrtPkts(pkt, pktlen, dig, 0)) { + if (!pgpPrtPkts(pkt.data, pkt.count, dig, 0)) { memcpy(signid, dig->signature.signid, sizeof(dig->signature.signid)); rc = 0; } dig = pgpFreeDig(dig); + rpmtdFreeData(&pkt); } - pkt = headerFreeData(pkt, pkttyp); return rc; } -- 2.7.4