Fix passing non-const char* in for const char*

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
index 807a0cecb843db2b1bee87b88d413bfbbc0f2779..93849eca340d943798fe7b32b73f1a110c1bc654 100644 (file)
--- a/src/lxc/lxc.h
+++ b/src/lxc/lxc.h
@@ -201,7 +201,7 @@ extern int lxc_container_put(struct lxc_container *c);
  * Get a list of valid wait states.
  * If states is NULL, simply return the number of states
  */
-extern int lxc_get_wait_states(char **states);
+extern int lxc_get_wait_states(const char **states);
 
 #ifdef __cplusplus
 }

diff --git a/src/lxc/lxc_wait.c b/src/lxc/lxc_wait.c
index 9c654152a22fd97f0577d78442ad40dfee1064b9..de1163e37091f7b927ab5b4eaadcc917ea69437f 100644 (file)
--- a/src/lxc/lxc_wait.c
+++ b/src/lxc/lxc_wait.c
@@ -87,5 +87,5 @@ int main(int argc, char *argv[])
                         my_args.progname, my_args.quiet))
                return -1;
 
-       return lxc_wait(my_args.name, my_args.states, my_args.timeout);
+       return lxc_wait(strdup(my_args.name), my_args.states, my_args.timeout);
 }

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 840679b5bbc7e08e8e70e8256d0fee7da7d1cb8a..471fecc2d3338fe713e44b88bbdb6113e5d31999 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -906,7 +906,7 @@ err:
        return NULL;
 }
 
-int lxc_get_wait_states(char **states)
+int lxc_get_wait_states(const char **states)
 {
        int i;
 

diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index 6320633424fce3fcf26436941e84ed58aa275cdc..cad31ee982ca8fb864882390cec647600733a5c0 100644 (file)
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -63,7 +63,7 @@ struct lxc_container {
 struct lxc_container *lxc_container_new(char *name);
 int lxc_container_get(struct lxc_container *c);
 int lxc_container_put(struct lxc_container *c);
-int lxc_get_wait_states(char **states);
+int lxc_get_wait_states(const char **states);
 
 #if 0
 char ** lxc_get_valid_keys();

diff --git a/src/tests/containertests.c b/src/tests/containertests.c
index ef3cda65b8f1e6531efcc84db185dc52d48bf65e..700374fcce9fa2beaaf2cb98599af6d72847c720 100644 (file)
--- a/src/tests/containertests.c
+++ b/src/tests/containertests.c
@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
                fprintf(stderr, "%d: lxc_get_wait_states gave %d not %d\n", __LINE__, numstates, MAX_STATE);
                goto out;
        }
-       char **sstr = malloc(numstates * sizeof(char *));
+       const char **sstr = malloc(numstates * sizeof(const char *));
        numstates = lxc_get_wait_states(sstr);
        int i;
        for (i=0; i<numstates; i++) {