Remove bogus consts from pgpDigParams_s structure
authorPanu Matilainen <pmatilai@redhat.com>
Mon, 24 Mar 2008 19:05:05 +0000 (21:05 +0200)
committerPanu Matilainen <pmatilai@redhat.com>
Mon, 24 Mar 2008 19:05:05 +0000 (21:05 +0200)
rpmio/digest.h
rpmio/rpmpgp.c

index 21d1a1a..a68cebb 100644 (file)
@@ -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. */
index 2c07fae..03b369c 100644 (file)
@@ -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));