aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-10-03 14:48:50 +0000
committerRoy Marples <roy@marples.name>2007-10-03 14:48:50 +0000
commit6d5ac5716b96c42dc95a21a4d246377f906d365e (patch)
treeadc7d0dc3abad53983c93b93f43e63b3ee60724a
parenta47070071017722d921ff3e8aa357d36f4f7a446 (diff)
rc_make_env -> rc_env_config, rc_filter_env -> rc_env_filter
-rw-r--r--src/librc-misc.c8
-rw-r--r--src/librc.h4
-rw-r--r--src/rc.c6
-rw-r--r--src/rc.h4
-rw-r--r--src/runscript.c4
5 files changed, 13 insertions, 13 deletions
diff --git a/src/librc-misc.c b/src/librc-misc.c
index 0d272d56..1db360dc 100644
--- a/src/librc-misc.c
+++ b/src/librc-misc.c
@@ -419,7 +419,7 @@ char **rc_config_list (const char *file)
}
librc_hidden_def(rc_config_list)
-char **rc_filter_env (void)
+char **rc_env_filter (void)
{
char **env = NULL;
char **whitelist = NULL;
@@ -517,7 +517,7 @@ char **rc_filter_env (void)
return (env);
}
-librc_hidden_def(rc_filter_env)
+librc_hidden_def(rc_env_filter)
/* Other systems may need this at some point, but for now it's Linux only */
#ifdef __linux__
@@ -553,7 +553,7 @@ static bool file_regex (const char *file, const char *regex)
}
#endif
-char **rc_make_env (void)
+char **rc_env_config (void)
{
char **env = NULL;
char *line;
@@ -695,4 +695,4 @@ char **rc_make_env (void)
free (runlevel);
return (env);
}
-librc_hidden_def(rc_make_env)
+librc_hidden_def(rc_env_config)
diff --git a/src/librc.h b/src/librc.h
index b99693b5..28f2e49d 100644
--- a/src/librc.h
+++ b/src/librc.h
@@ -63,15 +63,15 @@ librc_hidden_proto(rc_deptree_order_services)
librc_hidden_proto(rc_deptree_update)
librc_hidden_proto(rc_deptree_update_needed)
librc_hidden_proto(rc_env_bool)
+librc_hidden_proto(rc_env_config)
+librc_hidden_proto(rc_env_filter)
librc_hidden_proto(rc_exists)
-librc_hidden_proto(rc_filter_env)
librc_hidden_proto(rc_find_pids)
librc_hidden_proto(rc_is_dir)
librc_hidden_proto(rc_is_exec)
librc_hidden_proto(rc_is_file)
librc_hidden_proto(rc_is_link)
librc_hidden_proto(rc_ls_dir)
-librc_hidden_proto(rc_make_env)
librc_hidden_proto(rc_rm_dir)
librc_hidden_proto(rc_runlevel_exists)
librc_hidden_proto(rc_runlevel_get)
diff --git a/src/rc.c b/src/rc.c
index 76335df8..2f1f7bcf 100644
--- a/src/rc.c
+++ b/src/rc.c
@@ -486,7 +486,7 @@ static void sulogin (bool cont)
}
#endif
- newenv = rc_filter_env ();
+ newenv = rc_env_filter ();
if (cont) {
int status = 0;
@@ -823,8 +823,8 @@ int main (int argc, char **argv)
/* Ensure our environment is pure
Also, add our configuration to it */
- env = rc_filter_env ();
- tmplist = rc_make_env ();
+ env = rc_env_filter ();
+ tmplist = rc_env_config ();
rc_strlist_join (&env, tmplist);
rc_strlist_free (tmplist);
diff --git a/src/rc.h b/src/rc.h
index 00e6504a..7d1fce0a 100644
--- a/src/rc.h
+++ b/src/rc.h
@@ -357,11 +357,11 @@ char *rc_config_value (char **list, const char *entry);
/*! Return a NULL terminated string list of variables allowed through
* from the current environemnt. */
-char **rc_filter_env (void);
+char **rc_env_filter (void);
/*! Return a NULL terminated string list of enviroment variables made from
* our configuration files. */
-char **rc_make_env (void);
+char **rc_env_config (void);
/*! @name String List functions
* Handy functions for dealing with string arrays of char **.
diff --git a/src/runscript.c b/src/runscript.c
index 60268970..1a038602 100644
--- a/src/runscript.c
+++ b/src/runscript.c
@@ -1031,8 +1031,8 @@ int runscript (int argc, char **argv)
if ((softlevel = rc_xstrdup (getenv ("RC_SOFTLEVEL"))) == NULL) {
/* Ensure our environment is pure
Also, add our configuration to it */
- tmplist = rc_make_env();
- env = rc_filter_env ();
+ tmplist = rc_env_config ();
+ env = rc_env_filter ();
rc_strlist_join (&env, tmplist);
rc_strlist_free (tmplist);
tmplist = NULL;