From 773c2b9ca6c41626bf39ba1af914b5622d520fb8 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Fri, 18 Jan 2008 14:01:48 +0000 Subject: We should never change the list passed to rc_config_value. --- src/librc/librc-misc.c | 4 ++-- src/librc/rc.h | 2 +- src/rc/rc-misc.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c index 7b3c3dfa..be911e9f 100644 --- a/src/librc/librc-misc.c +++ b/src/librc/librc-misc.c @@ -243,9 +243,9 @@ char **rc_config_load (const char *file) } librc_hidden_def(rc_config_load) -char *rc_config_value (char **list, const char *entry) +char *rc_config_value (const char *const *list, const char *entry) { - char *line; + const char *line; int i; char *p; diff --git a/src/librc/rc.h b/src/librc/rc.h index 516d39f0..726d7f98 100644 --- a/src/librc/rc.h +++ b/src/librc/rc.h @@ -359,7 +359,7 @@ char **rc_config_list (const char *file); char **rc_config_load (const char *file); /*! Return the value of the entry from a key=value list. */ -char *rc_config_value (char **list, const char *entry); +char *rc_config_value (const char *const *list, const char *entry); /*! Check if a variable is a boolean and return it's value. * If variable is not a boolean then we set errno to be ENOENT when it does diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c index 56db3ff0..02d30c54 100644 --- a/src/rc/rc-misc.c +++ b/src/rc/rc-misc.c @@ -89,7 +89,7 @@ char *rc_conf_value (const char *setting) } } - return (rc_config_value (rc_conf, setting)); + return (rc_config_value ((const char *const *)rc_conf, setting)); } bool rc_conf_yesno (const char *setting) @@ -176,7 +176,7 @@ char **env_filter (void) env_len = strlen (env_name) + strlen ("export ") + 1; p = xmalloc (sizeof (char) * env_len); snprintf (p, env_len, "export %s", env_name); - env_var = rc_config_value (profile, p); + env_var = rc_config_value ((const char *const *) profile, p); free (p); } -- cgit v1.2.3