summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-11-20 18:19:48 +0000
committerRoy Marples <roy@marples.name>2007-11-20 18:19:48 +0000
commita76f2c20e410a1414b0922b22b00d1bc7c6cc35d (patch)
treee4615e9c105b02b110f295e0a95186e55967e43c /src
parent6a6ef66d15f37b771924b4c3504f173cb9dbc3f0 (diff)
downloadopenrc-a76f2c20e410a1414b0922b22b00d1bc7c6cc35d.tar.gz
openrc-a76f2c20e410a1414b0922b22b00d1bc7c6cc35d.tar.bz2
openrc-a76f2c20e410a1414b0922b22b00d1bc7c6cc35d.tar.xz
opts -> extra_commands. This is much more descriptive.
Diffstat (limited to 'src')
-rw-r--r--src/librc.c10
-rw-r--r--src/librc.h2
-rw-r--r--src/rc.h8
3 files changed, 10 insertions, 10 deletions
diff --git a/src/librc.c b/src/librc.c
index d5ab76f..da443b7 100644
--- a/src/librc.c
+++ b/src/librc.c
@@ -300,12 +300,12 @@ bool rc_service_exists (const char *service)
librc_hidden_def(rc_service_exists)
#define OPTSTR ". '%s'; echo \"${opts}\""
-char **rc_service_options (const char *service)
+char **rc_service_extra_commands (const char *service)
{
char *svc;
char *cmd = NULL;
char *buffer = NULL;
- char **opts = NULL;
+ char **commands = NULL;
char *token;
char *p = buffer;
FILE *fp;
@@ -324,15 +324,15 @@ char **rc_service_options (const char *service)
if (buffer[strlen (buffer) - 1] == '\n')
buffer[strlen (buffer) - 1] = '\0';
while ((token = strsep (&p, " ")))
- rc_strlist_addsort (&opts, token);
+ rc_strlist_addsort (&commands, token);
}
pclose (fp);
free (buffer);
}
free (cmd);
- return (opts);
+ return (commands);
}
-librc_hidden_def(rc_service_options)
+librc_hidden_def(rc_service_extra_commands)
#define DESCSTR ". '%s'; echo \"${description%s%s}\""
char *rc_service_description (const char *service, const char *option)
diff --git a/src/librc.h b/src/librc.h
index a48f9f9..fb37e8c 100644
--- a/src/librc.h
+++ b/src/librc.h
@@ -95,9 +95,9 @@ librc_hidden_proto(rc_service_daemon_set)
librc_hidden_proto(rc_service_delete)
librc_hidden_proto(rc_service_description)
librc_hidden_proto(rc_service_exists)
+librc_hidden_proto(rc_service_extra_commands)
librc_hidden_proto(rc_service_in_runlevel)
librc_hidden_proto(rc_service_mark)
-librc_hidden_proto(rc_service_options)
librc_hidden_proto(rc_service_plugable)
librc_hidden_proto(rc_service_resolve)
librc_hidden_proto(rc_service_schedule_clear)
diff --git a/src/rc.h b/src/rc.h
index 681a550..2b392a4 100644
--- a/src/rc.h
+++ b/src/rc.h
@@ -143,10 +143,10 @@ bool rc_service_in_runlevel (const char *service, const char *runlevel);
* @return true if service state change was successful, otherwise false */
bool rc_service_mark (const char *service, rc_service_state_t state);
-/*! Lists the extra options a service has
- * @param service to load the options from
- * @return NULL terminated string list of options */
-char **rc_service_options (const char *service);
+/*! Lists the extra commands a service has
+ * @param service to load the commands from
+ * @return NULL terminated string list of commands */
+char **rc_service_extra_commands (const char *service);
/*! Check if the service is allowed to be hot/cold plugged
* @param service to check