From f00a37f33877c9cf59f1b0a90f3851eb4ffdd1e7 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 23 May 2008 13:11:13 +0300 Subject: [PATCH] Convert readFile() to new headerGet()... --- lib/rpmchecksig.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index cf6e581..5124511 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -481,13 +481,9 @@ static int readFile(FD_t fd, const char * fn, pgpDig dig) dig->nbytes += headerSizeof(h, HEADER_MAGIC_YES); if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) { - void * uh; - rpmTagType uht; - rpm_count_t uhc; + struct rpmtd_s utd; - if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc) - || uh == NULL) - { + if (!headerGet(h, RPMTAG_HEADERIMMUTABLE, &utd, HEADERGET_DEFAULT)){ h = headerFree(h); rpmlog(RPMLOG_ERR, _("%s: Immutable header region could not be read. " @@ -496,11 +492,11 @@ static int readFile(FD_t fd, const char * fn, pgpDig dig) } dig->hdrsha1ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE); (void) rpmDigestUpdate(dig->hdrsha1ctx, header_magic, sizeof(header_magic)); - (void) rpmDigestUpdate(dig->hdrsha1ctx, uh, uhc); + (void) rpmDigestUpdate(dig->hdrsha1ctx, utd.data, utd.count); dig->hdrmd5ctx = rpmDigestInit(dig->signature.hash_algo, RPMDIGEST_NONE); (void) rpmDigestUpdate(dig->hdrmd5ctx, header_magic, sizeof(header_magic)); - (void) rpmDigestUpdate(dig->hdrmd5ctx, uh, uhc); - uh = headerFreeData(uh, uht); + (void) rpmDigestUpdate(dig->hdrmd5ctx, utd.data, utd.count); + rpmtdFreeData(&utd); } h = headerFree(h); } -- 2.7.4