4 files changed, 6 insertions, 6 deletions
diff --git a/rpmio/argv.c b/rpmio/argv.c
index b29468fb0..cc1ec3f67 100644
--- a/rpmio/argv.c
+++ b/rpmio/argv.c
@@ -68,7 +68,7 @@ int argiCount(ARGI_t argi)
     return nvals;
 }
 
-const ARGint_t argiData(const ARGI_t argi)
+ARGint_t argiData(const ARGI_t argi)
 {
     ARGint_t vals = NULL;
     if (argi && argi->nvals > 0)
@@ -85,7 +85,7 @@ int argvCount(const ARGV_t argv)
     return argc;
 }
 
-const ARGV_t argvData(const ARGV_t argv)
+ARGV_t argvData(const ARGV_t argv)
 {
 /*@-retalias -temptrans @*/
     return argv;
diff --git a/rpmio/argv.h b/rpmio/argv.h
index 202aa4645..7cab8f23d 100644
--- a/rpmio/argv.h
+++ b/rpmio/argv.h
@@ -61,7 +61,7 @@ int argiCount(/*@null@*/ const ARGI_t argi)
  * @return		argi array data address
  */
 /*@null@*/
-const ARGint_t argiData(/*@null@*/ const ARGI_t argi)
+ARGint_t argiData(/*@null@*/ const ARGI_t argi)
 	/*@*/;
 
 /**
@@ -78,7 +78,7 @@ int argvCount(/*@null@*/ const ARGV_t argv)
  * @return		argv array data address
  */
 /*@null@*/
-const ARGV_t argvData(/*@null@*/ const ARGV_t argv)
+ARGV_t argvData(/*@null@*/ const ARGV_t argv)
 	/*@*/;
 
 /**
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index c6d3a9029..31ca058a1 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -687,7 +687,7 @@ fprintf(stderr, "*** read: fd %p rc %d EOF errno %d %s \"%s\"\n", fd, rc, errno,
 /* =============================================================== */
 /* Support for FTP/HTTP I/O.
  */
-const char *const ftpStrerror(int errorNumber)
+const char * ftpStrerror(int errorNumber)
 {
     switch (errorNumber) {
     case 0:
diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index 2d6a53135..9ae9aaf22 100644
--- a/rpmio/rpmio.h
+++ b/rpmio/rpmio.h
@@ -599,7 +599,7 @@ typedef enum ftperrCode_e {
 /**
  */
 /*@-redecl@*/
-/*@observer@*/ const char *const ftpStrerror(int errorNumber)
+/*@observer@*/ const char * ftpStrerror(int errorNumber)
 	/*@*/;
 /*@=redecl@*/