summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-18 14:01:48 +0000
committerRoy Marples <roy@marples.name>2008-01-18 14:01:48 +0000
commit773c2b9ca6c41626bf39ba1af914b5622d520fb8 (patch)
tree4a9f35fa42b4901cca915ad7cf62370018972863 /src
parent87f785cc31da9e30cc0fb631b035e3fd25161e89 (diff)
downloadopenrc-773c2b9ca6c41626bf39ba1af914b5622d520fb8.tar.gz
openrc-773c2b9ca6c41626bf39ba1af914b5622d520fb8.tar.bz2
openrc-773c2b9ca6c41626bf39ba1af914b5622d520fb8.tar.xz
We should never change the list passed to rc_config_value.
Diffstat (limited to 'src')
-rw-r--r--src/librc/librc-misc.c4
-rw-r--r--src/librc/rc.h2
-rw-r--r--src/rc/rc-misc.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c
index 7b3c3df..be911e9 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 516d39f..726d7f9 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 56db3ff..02d30c5 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);
}