Another bunch of bogus const removals

diff --git a/build/build.c b/build/build.c
index fd3f37b..120ef42 100644 (file)
--- a/build/build.c
+++ b/build/build.c
@@ -54,9 +54,9 @@ rpmRC doScript(rpmSpec spec, rpmBuildFlags what, const char *name, StringBuf sb,
     const char *scriptName = NULL;
     char * buildDirURL = rpmGenPath(rootURL, "%{_builddir}", "");
     const char * buildScript;
-    const char * buildCmd = NULL;
-    const char * buildTemplate = NULL;
-    const char * buildPost = NULL;
+    char * buildCmd = NULL;
+    char * buildTemplate = NULL;
+    char * buildPost = NULL;
     const char * mTemplate = NULL;
     const char * mCmd = NULL;
     const char * mPost = NULL;

diff --git a/lib/psm.c b/lib/psm.c
index 18ecad0..8b5b382 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1398,7 +1398,7 @@ assert(psm->mi == NULL);
        if (psm->goal == PSM_PKGSAVE) {
            /* Open output package for writing. */
            {   char * bfmt = rpmGetPath("%{_repackage_name_fmt}", NULL);
-               const char * pkgbn =
+               char * pkgbn =
                        headerSprintf(fi->h, bfmt, rpmTagTable, rpmHeaderFormats, NULL);
 
                bfmt = _free(bfmt);

diff --git a/lib/query.c b/lib/query.c
index 7a4ec85..0461452 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -152,7 +152,7 @@ int showQueryPackage(QVA_t qva, rpmts ts, Header h)
     *te = '\0';
 
     if (qva->qva_queryFormat != NULL) {
-       const char * str = queryHeader(h, qva->qva_queryFormat);
+       char * str = queryHeader(h, qva->qva_queryFormat);
        if (str) {
            size_t tx = (te - t);
 

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 2e36925..922c614 100644 (file)
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -1282,7 +1282,7 @@ if (fi->actions == NULL)
      && !headerIsSource(h)
      && !headerIsEntry(h, RPMTAG_ORIGBASENAMES))
     {
-       const char * fmt = rpmGetPath("%{?_autorelocate_path}", NULL);
+       char * fmt = rpmGetPath("%{?_autorelocate_path}", NULL);
        const char * errstr;
        char * newPath;
        Header foo;

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 76d0c6c..fed2905 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -252,7 +252,7 @@ int rpmInstall(rpmts ts,
     rpmps ps;
     rpmprobFilterFlags probFilter;
     rpmRelocation * relocations;
-const char * fileURL = NULL;
+    const char * fileURL = NULL;
     int stopInstall = 0;
     const char ** av = NULL;
     rpmVSFlags vsflags, ovsflags, tvsflags;

diff --git a/lib/rpmts.c b/lib/rpmts.c
index c511f17..af406c7 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -592,8 +592,8 @@ static int sugcmp(const void * a, const void * b)
 int rpmtsSolve(rpmts ts, rpmds ds, const void * data)
 {
     const char * errstr;
-    const char * str;
-    const char * qfmt;
+    char * str;
+    char * qfmt;
     rpmdbMatchIterator mi;
     Header bh;
     Header h;