summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2008-03-24 22:42:34 +0200
committerPanu Matilainen <pmatilai@redhat.com>2008-03-24 22:42:34 +0200
commite501ac2e77ab4f145c75558aa456b7f5f481d254 (patch)
treefc1dcff722b6b9339430ca6cdb8ddbda425f5cff /lib
parent3e57c865c5d3b65fea8bcddb376e0bc859b598e3 (diff)
downloadrpm-e501ac2e77ab4f145c75558aa456b7f5f481d254.tar.gz
rpm-e501ac2e77ab4f145c75558aa456b7f5f481d254.tar.bz2
rpm-e501ac2e77ab4f145c75558aa456b7f5f481d254.zip
Remove bogus const from rpmRelocation struct
Diffstat (limited to 'lib')
-rw-r--r--lib/rpmcli.h2
-rw-r--r--lib/rpmfi.h4
-rw-r--r--lib/rpminstall.c2
-rw-r--r--lib/rpmte.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index a9802f44c..cd60d07d4 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -426,7 +426,7 @@ struct rpmInstallArguments_s {
int noDeps;
int incldocs;
rpmRelocation * relocations;
- const char * prefix;
+ char * prefix;
const char * rootdir;
};
diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index aba449f0a..6c6abea22 100644
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -91,8 +91,8 @@ typedef enum rpmFileAction_e {
* We pass these around as an array with a sentinel.
*/
struct rpmRelocation_s {
- const char * oldPath; /*!< NULL here evals to RPMTAG_DEFAULTPREFIX, */
- const char * newPath; /*!< NULL means to omit the file completely! */
+ char * oldPath; /*!< NULL here evals to RPMTAG_DEFAULTPREFIX, */
+ char * newPath; /*!< NULL means to omit the file completely! */
};
/** \ingroup rpmfi
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index d192b8258..fb249fa0e 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -489,7 +489,7 @@ if (fileURL[0] == '=') {
/* XXX reference held by transaction set */
eiu->h = headerFree(eiu->h);
if (eiu->relocations)
- eiu->relocations->oldPath = _constfree(eiu->relocations->oldPath);
+ eiu->relocations->oldPath = _free(eiu->relocations->oldPath);
switch(rc) {
case 0:
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 94113efb3..96468e53b 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -36,8 +36,8 @@ static void delTE(rpmte p)
if (p->relocs) {
for (r = p->relocs; (r->oldPath || r->newPath); r++) {
- r->oldPath = _constfree(r->oldPath);
- r->newPath = _constfree(r->newPath);
+ r->oldPath = _free(r->oldPath);
+ r->newPath = _free(r->newPath);
}
p->relocs = _free(p->relocs);
}