Remove const from bunch of error message return types

- headerCheck(), rpmReadHeader() and rpmReadSignature() return malloced
  error messages the caller needs to free, shouldn't be const
- adjust rpmdb hdrchk callbacks accordingly

diff --git a/lib/package.c b/lib/package.c
index fe0ee8f..9e10867 100644 (file)
--- a/lib/package.c
+++ b/lib/package.c
@@ -303,7 +303,7 @@ int headerVerifyInfo(int il, int dl, const void * pev, void * iv, int negate)
  * @retval *msg                signature verification msg
  * @return             RPMRC_OK/RPMRC_NOTFOUND/RPMRC_FAIL
  */
-rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, const char ** msg)
+rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, char ** msg)
 {
     pgpDig dig;
     char buf[8*BUFSIZ];
@@ -593,7 +593,7 @@ verifyinfo_exit:
     return rc;
 }
 
-rpmRC rpmReadHeader(rpmts ts, FD_t fd, Header *hdrp, const char ** msg)
+rpmRC rpmReadHeader(rpmts ts, FD_t fd, Header *hdrp, char ** msg)
 {
     char buf[BUFSIZ];
     int32_t block[4];
@@ -690,7 +690,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
     rpmtsOpX opx;
     size_t nb;
     Header h = NULL;
-    const char * msg;
+    char * msg;
     rpmVSFlags vsflags;
     rpmRC rc = RPMRC_FAIL;     /* assume failure */
     int xx;

diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index bd374b0..8671030 100644 (file)
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -160,7 +160,7 @@ static int rpmReSign(rpmts ts,
     const char *sigtarget = NULL;
     char tmprpm[1024+1];
     Header sigh = NULL;
-    const char * msg;
+    char * msg;
     void * uh = NULL;
     rpm_tagtype_t uht;
     rpm_count_t uhc;
@@ -530,7 +530,7 @@ int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd,
     rpm_count_t siglen;
     Header sigh = NULL;
     HeaderIterator hi;
-    const char * msg;
+    char * msg;
     int res = 0;
     int xx;
     rpmRC rc;

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 730d13a..f2cf38b 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -300,8 +300,7 @@ rpmRC headerCheckPayloadFormat(Header h);
  * @retval *msg                verification error message (or NULL)
  * @return             RPMRC_OK on success
  */
-rpmRC headerCheck(rpmts ts, const void * uh, size_t uc,
-               const char ** msg);
+rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, char ** msg);
 
 /**  \ingroup header
  * Return checked and loaded header.
@@ -311,8 +310,7 @@ rpmRC headerCheck(rpmts ts, const void * uh, size_t uc,
  * @retval *msg                verification error message (or NULL)
  * @return             RPMRC_OK on success
  */
-rpmRC rpmReadHeader(rpmts ts, FD_t fd, Header *hdrp,
-               const char ** msg);
+rpmRC rpmReadHeader(rpmts ts, FD_t fd, Header *hdrp, char ** msg);
 
 /** \ingroup header
  * Return package header from file handle, verifying digests/signatures.

diff --git a/lib/signature.c b/lib/signature.c
index b3ce858..3845689 100644 (file)
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -125,8 +125,7 @@ static unsigned char header_magic[8] = {
     0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
 };
 
-rpmRC rpmReadSignature(FD_t fd, Header * sighp, sigType sig_type,
-               const char ** msg)
+rpmRC rpmReadSignature(FD_t fd, Header * sighp, sigType sig_type, char ** msg)
 {
     char buf[BUFSIZ];
     int32_t block[4];

diff --git a/lib/signature.h b/lib/signature.h
index d02580c..3085539 100644 (file)
--- a/lib/signature.h
+++ b/lib/signature.h
@@ -45,8 +45,7 @@ Header rpmNewSignature(void);
  * @retval msg         failure msg
  * @return             rpmRC return code
  */
-rpmRC rpmReadSignature(FD_t fd, Header *sighp,
-               sigType sig_type, const char ** msg);
+rpmRC rpmReadSignature(FD_t fd, Header *sighp, sigType sig_type, char ** msg);
 
 /** \ingroup signature
  * Write signature header.

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index b60ef8f..d48db7e 100644 (file)
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -754,7 +754,7 @@ rpmts_HdrCheck(rpmtsObject * s, PyObject * args, PyObject * kwds)
 {
     PyObject * blob;
     PyObject * result = NULL;
-    const char * msg = NULL;
+    char * msg = NULL;
     const void * uh;
     int uc;
     rpmRC rpmrc;

diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 7074881..1cb262d 100644 (file)
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -608,7 +608,7 @@ struct rpmdbMatchIterator_s {
     int                        mi_nre;
     miRE               mi_re;
     rpmts              mi_ts;
-    rpmRC (*mi_hdrchk) (rpmts ts, const void * uh, size_t uc, const char ** msg);
+    rpmRC (*mi_hdrchk) (rpmts ts, const void * uh, size_t uc, char ** msg);
 
 };
 
@@ -1486,7 +1486,7 @@ static int miFreeHeader(rpmdbMatchIterator mi, dbiIndex dbi)
 
        /* Check header digest/signature on blob export (if requested). */
        if (mi->mi_hdrchk && mi->mi_ts) {
-           const char * msg = NULL;
+           char * msg = NULL;
            int lvl;
 
            rpmrc = (*mi->mi_hdrchk) (mi->mi_ts, data->data, data->size, &msg);
@@ -1967,7 +1967,7 @@ int rpmdbSetIteratorModified(rpmdbMatchIterator mi, int modified)
 }
 
 int rpmdbSetHdrChk(rpmdbMatchIterator mi, rpmts ts,
-       rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
+       rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg))
 {
     int rc = 0;
     if (mi == NULL)
@@ -2112,7 +2112,7 @@ if (dbiByteSwapped(dbi) == 1)
 
        /* If blob is unchecked, check blob import consistency now. */
        if (rpmrc != RPMRC_OK) {
-           const char * msg = NULL;
+           char * msg = NULL;
            int lvl;
 
            rpmrc = (*mi->mi_hdrchk) (mi->mi_ts, uh, uhlen, &msg);
@@ -2413,7 +2413,7 @@ return mi;
 /* XXX psm.c */
 int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum,
                rpmts ts,
-               rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
+               rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg))
 {
 DBC * dbcursor = NULL;
 DBT * key = alloca(sizeof(*key));
@@ -2693,8 +2693,8 @@ if (key->size == 0) key->size++;  /* XXX "/" fixup. */
 
 /* XXX install.c */
 int rpmdbAdd(rpmdb db, int iid, Header h,
-               rpmts ts,
-               rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
+            rpmts ts,
+            rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg))
 {
 DBC * dbcursor = NULL;
 DBT * key = alloca(sizeof(*key));
@@ -2856,7 +2856,7 @@ data->size = headerSizeof(h, HEADER_MAGIC_NO);
 
                /* Check header digest/signature on blob export. */
                if (hdrchk && ts) {
-                   const char * msg = NULL;
+                   char * msg = NULL;
                    int lvl;
 
                    rpmrc = (*hdrchk) (ts, data->data, data->size, &msg);
@@ -3414,7 +3414,7 @@ static int rpmdbMoveDatabase(const char * prefix,
 }
 
 int rpmdbRebuild(const char * prefix, rpmts ts,
-               rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg))
+               rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg))
 {
     rpmdb olddb;
     char * dbpath = NULL;

diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
index 4afa411..8d988ac 100644 (file)
--- a/rpmdb/rpmdb.h
+++ b/rpmdb/rpmdb.h
@@ -225,7 +225,7 @@ int rpmdbSetIteratorModified(rpmdbMatchIterator mi, int modified);
  * @return             0 always
  */
 int rpmdbSetHdrChk(rpmdbMatchIterator mi, rpmts ts,
-               rpmRC (*hdrchk) (rpmts ts, const void * uh, size_t uc, const char ** msg));
+       rpmRC (*hdrchk) (rpmts ts, const void * uh, size_t uc, char ** msg));
 
 /** \ingroup rpmdb
  * Return database iterator.
@@ -277,7 +277,7 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi);
  * @return             0 on success
  */
 int rpmdbAdd(rpmdb db, int iid, Header h, rpmts ts,
-               rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg));
+            rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg));
 
 /** \ingroup rpmdb
  * Remove package header from rpm database and indices.
@@ -290,7 +290,7 @@ int rpmdbAdd(rpmdb db, int iid, Header h, rpmts ts,
  */
 int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum,
                rpmts ts,
-               rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg));
+               rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg));
 
 /** \ingroup rpmdb
  * Rebuild database indices from package headers.
@@ -300,7 +300,7 @@ int rpmdbRemove(rpmdb db, int rid, unsigned int hdrNum,
  * @return             0 on success
  */
 int rpmdbRebuild(const char * prefix, rpmts ts,
-               rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, const char ** msg));
+               rpmRC (*hdrchk) (rpmts ts, const void *uh, size_t uc, char ** msg));
 
 #ifdef __cplusplus
 }