Remove bogus const from rpmGlob argv return type

- it's malloced and must be freed by caller

diff --git a/build/files.c b/build/files.c
index c3b8864..a0d26c3 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -1728,7 +1728,7 @@ static rpmRC processBinaryFile(Package pkg, FileList fl,
     diskURL = rpmGenPath(fl->buildRootURL, NULL, fileURL);
 
     if (doGlob) {
-       const char ** argv = NULL;
+       char ** argv = NULL;
        int argc = 0;
        int i;
 

diff --git a/lib/idtx.c b/lib/idtx.c
index f4c2031..4d7e1f9 100644 (file)
--- a/lib/idtx.c
+++ b/lib/idtx.c
@@ -114,7 +114,7 @@ IDTX IDTXglob(rpmts ts, const char * globstr, rpm_tag_t tag)
     Header h;
     int32_t * tidp;
     FD_t fd;
-    const char ** av = NULL;
+    char ** av = NULL;
     int ac = 0;
     rpmRC rpmrc;
     int xx;

diff --git a/lib/manifest.c b/lib/manifest.c
index 6fcfaeb..2b01052 100644 (file)
--- a/lib/manifest.c
+++ b/lib/manifest.c
@@ -65,7 +65,7 @@ rpmRC rpmReadPackageManifest(FD_t fd, int * argcPtr, const char *** argvPtr)
     char * s = NULL;
     char * se;
     int ac = 0;
-    const char ** av = NULL;
+    char ** av = NULL;
     int argc = (argcPtr ? *argcPtr : 0);
     const char ** argv = (argvPtr ? *argvPtr : NULL);
     FILE * f = fdGetFILE(fd);

diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index f0e0f17..1f6bb7d 100644 (file)
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -310,7 +310,7 @@ static rpmRC rpmgiGlobArgv(rpmgi gi, ARGV_t argv)
 
     if (argv != NULL)
     while ((arg = *argv++) != NULL) {
-       ARGV_t av = NULL;
+       char ** av = NULL;
 
        xx = rpmGlob(arg, &ac, &av);
        xx = argvAppend(&gi->argv, av);

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index fed2905..0fd0eae 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -254,7 +254,7 @@ int rpmInstall(rpmts ts,
     rpmRelocation * relocations;
     const char * fileURL = NULL;
     int stopInstall = 0;
-    const char ** av = NULL;
+    char ** av = NULL;
     rpmVSFlags vsflags, ovsflags, tvsflags;
     int ac = 0;
     int rc;

diff --git a/rpmio/macro.c b/rpmio/macro.c
index c0a6c47..f06c8ee 100644 (file)
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -1546,7 +1546,7 @@ rpmInitMacros(rpmMacroContext mc, const char * macrofiles)
 
     mfiles = xstrdup(macrofiles);
     for (m = mfiles; m && *m != '\0'; m = me) {
-       const char ** av;
+       char ** av;
        int ac;
        int i;
 

diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index 1b56f24..5f3d350 100644 (file)
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -702,12 +702,12 @@ exit:
 /* =============================================================== */
 static int _debug = 0;
 
-int rpmGlob(const char * patterns, int * argcPtr, const char *** argvPtr)
+int rpmGlob(const char * patterns, int * argcPtr, char *** argvPtr)
 {
     int ac = 0;
     const char ** av = NULL;
     int argc = 0;
-    const char ** argv = NULL;
+    char ** argv = NULL;
     char * globRoot = NULL;
     const char *home = getenv("HOME");
     int gflags = 0;

diff --git a/rpmio/rpmfileutil.h b/rpmio/rpmfileutil.h
index 7ef6504..336ccd2 100644 (file)
--- a/rpmio/rpmfileutil.h
+++ b/rpmio/rpmfileutil.h
@@ -101,7 +101,6 @@ char * rpmGetPath (const char * path, ...);
  * @retval *argvPtr    array of paths (malloc'd contiguous blob)
  * @return             0 on success
  */
-int rpmGlob(const char * patterns, int * argcPtr,
-               const char *** argvPtr);
+int rpmGlob(const char * patterns, int * argcPtr, char *** argvPtr);
 
 #endif /* _RPMFILEUTIL_H */

diff --git a/tools/rpmcache.c b/tools/rpmcache.c
index 9db3058..006b5e6 100644 (file)
--- a/tools/rpmcache.c
+++ b/tools/rpmcache.c
@@ -42,7 +42,7 @@ static int nbhglobs = 5;
 static int indent = 2;
 
 typedef struct Item_s {
-    const char * path;
+    char * path;
     int32_t size;
     int32_t mtime;
     rpmds this;
@@ -470,7 +470,7 @@ static void initGlobs(rpmts ts, const char ** argv)
     nbhglobs = 5;
     bhglobs = xcalloc(nbhglobs, sizeof(*bhglobs));
     for (i = 0; i < nbhglobs; i++) {
-       const char * pattern;
+       char * pattern;
        const char * macro;
 
        switch (i) {

diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index 81b89fc..fc0f417 100644 (file)
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -43,17 +43,17 @@ static int
 rpmGraph(rpmts ts, struct rpmInstallArguments_s * ia, const char ** fileArgv)
 {
     rpmps ps;
-    const char ** pkgURL = NULL;
+    char ** pkgURL = NULL;
     char * pkgState = NULL;
     const char ** fnp;
-    const char * fileURL = NULL;
+    char * fileURL = NULL;
     int numPkgs = 0;
     int numFailed = 0;
     int prevx = 0;
     int pkgx = 0;
-    const char ** argv = NULL;
+    char ** argv = NULL;
     int argc = 0;
-    const char ** av = NULL;
+    char ** av = NULL;
     int ac = 0;
     Header h;
     rpmRC rpmrc;
@@ -107,7 +107,7 @@ restart:
     fileURL = _free(fileURL);
 
     /* Continue processing file arguments, building transaction set. */
-    for (fnp = pkgURL+prevx; *fnp != NULL; fnp++, prevx++) {
+    for (fnp = (pkgURL+prevx); *fnp != NULL; fnp++, prevx++) {
        const char * fileName;
        FD_t fd;