From 9a4a5c9ef8f03aca05f7eeed3e7afb297ac72a6b Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 24 Mar 2008 21:05:05 +0200 Subject: [PATCH] Remove bogus consts from pgpDigParams_s structure --- rpmio/digest.h | 6 +++--- rpmio/rpmpgp.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rpmio/digest.h b/rpmio/digest.h index 21d1a1a..a68cebb 100644 --- a/rpmio/digest.h +++ b/rpmio/digest.h @@ -15,9 +15,9 @@ * Values parsed from OpenPGP signature/pubkey packet(s). */ struct pgpDigParams_s { - const char * userid; - const uint8_t * hash; - const char * params[4]; + char * userid; + uint8_t * hash; + char * params[4]; uint8_t tag; uint8_t version; /*!< version number. */ diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index 2c07fae..03b369c 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -1048,14 +1048,14 @@ void pgpCleanDig(pgpDig dig) { if (dig != NULL) { int i; - dig->signature.userid = _constfree(dig->signature.userid); - dig->pubkey.userid = _constfree(dig->pubkey.userid); - dig->signature.hash = _constfree(dig->signature.hash); - dig->pubkey.hash = _constfree(dig->pubkey.hash); + dig->signature.userid = _free(dig->signature.userid); + dig->pubkey.userid = _free(dig->pubkey.userid); + dig->signature.hash = _free(dig->signature.hash); + dig->pubkey.hash = _free(dig->pubkey.hash); /* FIX: double indirection */ for (i = 0; i < 4; i++) { - dig->signature.params[i] = _constfree(dig->signature.params[i]); - dig->pubkey.params[i] = _constfree(dig->pubkey.params[i]); + dig->signature.params[i] = _free(dig->signature.params[i]); + dig->pubkey.params[i] = _free(dig->pubkey.params[i]); } memset(&dig->signature, 0, sizeof(dig->signature)); -- 2.7.4