emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rc_schedule_clear -> rc_service_schedule_clear, rc_schedule_start_service -> rc_service_schedule_start

Browse Source
This commit is contained in:
Roy Marples
2007-10-03 14:18:52 +00:00
parent 4c3bf59c5b
commit 563c6f46c0
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/librc.c
View File

@ -378,7 +378,7 @@ bool rc_service_mark (const char *service, const rc_service_state_t state)
rc_rm_dir (dir, true); rc_rm_dir (dir, true);
free (dir); free (dir);
rc_schedule_clear (service); rc_service_schedule_clear (service);
} }
/* These are final states, so remove us from scheduled */ /* These are final states, so remove us from scheduled */
@ -566,7 +566,7 @@ pid_t rc_service_start (const char *service)
} }
librc_hidden_def(rc_service_start) librc_hidden_def(rc_service_start)
bool rc_schedule_start_service (const char *service, bool rc_service_schedule_start (const char *service,
const char *service_to_start) const char *service_to_start)
{ {
char *dir; char *dir;
@ -600,9 +600,9 @@ bool rc_schedule_start_service (const char *service,
return (retval); return (retval);
} }
librc_hidden_def(rc_schedule_start_service) librc_hidden_def(rc_service_schedule_start)
void rc_schedule_clear (const char *service) void rc_service_schedule_clear (const char *service)
{ {
char *svc = rc_xstrdup (service); char *svc = rc_xstrdup (service);
char *dir = rc_strcatpaths (RC_SVCDIR, "scheduled", basename (svc), char *dir = rc_strcatpaths (RC_SVCDIR, "scheduled", basename (svc),
@ -613,7 +613,7 @@ void rc_schedule_clear (const char *service)
rc_rm_dir (dir, true); rc_rm_dir (dir, true);
free (dir); free (dir);
} }
librc_hidden_def(rc_schedule_clear) librc_hidden_def(rc_service_schedule_clear)
bool rc_service_wait (const char *service) bool rc_service_wait (const char *service)
{ {

4
src/librc.h
View File

@ -79,8 +79,6 @@ librc_hidden_proto(rc_runlevel_list)
librc_hidden_proto(rc_runlevel_set) librc_hidden_proto(rc_runlevel_set)
librc_hidden_proto(rc_runlevel_starting) librc_hidden_proto(rc_runlevel_starting)
librc_hidden_proto(rc_runlevel_stopping) librc_hidden_proto(rc_runlevel_stopping)
librc_hidden_proto(rc_schedule_clear)
librc_hidden_proto(rc_schedule_start_service)
librc_hidden_proto(rc_service_add) librc_hidden_proto(rc_service_add)
librc_hidden_proto(rc_service_daemons_crashed) librc_hidden_proto(rc_service_daemons_crashed)
librc_hidden_proto(rc_service_daemon_set) librc_hidden_proto(rc_service_daemon_set)
@ -94,6 +92,8 @@ librc_hidden_proto(rc_service_option_set)
librc_hidden_proto(rc_service_options) librc_hidden_proto(rc_service_options)
librc_hidden_proto(rc_service_plugable) librc_hidden_proto(rc_service_plugable)
librc_hidden_proto(rc_service_resolve) librc_hidden_proto(rc_service_resolve)
librc_hidden_proto(rc_service_schedule_clear)
librc_hidden_proto(rc_service_schedule_start)
librc_hidden_proto(rc_service_start) librc_hidden_proto(rc_service_start)
librc_hidden_proto(rc_service_stop) librc_hidden_proto(rc_service_stop)
librc_hidden_proto(rc_service_wait) librc_hidden_proto(rc_service_wait)

4
src/rc.h
View File

@ -110,7 +110,7 @@ pid_t rc_service_stop (const char *service);
/*! Schedule a service to be started when another service starts /*! Schedule a service to be started when another service starts
* @param service that starts the scheduled service when started * @param service that starts the scheduled service when started
* @param service_to_start service that will be started */ * @param service_to_start service that will be started */
bool rc_schedule_start_service (const char *service, bool rc_service_schedule_start (const char *service,
const char *service_to_start); const char *service_to_start);
/*! Return a NULL terminated list of services that are scheduled to start /*! Return a NULL terminated list of services that are scheduled to start
* when the given service has started * when the given service has started
@ -120,7 +120,7 @@ char **rc_services_scheduled_by (const char *service);
/*! Clear the list of services scheduled to be started by this service /*! Clear the list of services scheduled to be started by this service
* @param service to clear */ * @param service to clear */
void rc_schedule_clear (const char *service); void rc_service_schedule_clear (const char *service);
/*! Wait for a service to finish /*! Wait for a service to finish
* @param service to wait for * @param service to wait for

8
src/runscript.c
View File

@ -237,7 +237,7 @@ static void start_services (char **list) {
if (state & RC_SERVICE_INACTIVE || if (state & RC_SERVICE_INACTIVE ||
state & RC_SERVICE_WASINACTIVE) state & RC_SERVICE_WASINACTIVE)
{ {
rc_schedule_start_service (service, svc); rc_service_schedule_start (service, svc);
ewarn ("WARNING: %s is scheduled to started when %s has started", ewarn ("WARNING: %s is scheduled to started when %s has started",
svc, applet); svc, applet);
} else } else
@ -680,7 +680,7 @@ static void svc_start (bool deps)
types = NULL; types = NULL;
rc_strlist_add (&types, "iprovide"); rc_strlist_add (&types, "iprovide");
STRLIST_FOREACH (tmplist, svc, i) { STRLIST_FOREACH (tmplist, svc, i) {
rc_schedule_start_service (svc, service); rc_service_schedule_start (svc, service);
rc_strlist_free (svclist); rc_strlist_free (svclist);
svclist = NULL; svclist = NULL;
@ -689,7 +689,7 @@ static void svc_start (bool deps)
providelist = rc_deptree_depends (deptree, types, svclist, providelist = rc_deptree_depends (deptree, types, svclist,
softlevel, depoptions); softlevel, depoptions);
STRLIST_FOREACH (providelist, svc2, j) STRLIST_FOREACH (providelist, svc2, j)
rc_schedule_start_service (svc2, service); rc_service_schedule_start (svc2, service);
len += strlen (svc) + 2; len += strlen (svc) + 2;
n++; n++;
@ -1244,7 +1244,7 @@ int runscript (int argc, char **argv)
int j; int j;
STRLIST_FOREACH (restart_services, svc, j) STRLIST_FOREACH (restart_services, svc, j)
if (rc_service_state (svc) & RC_SERVICE_STOPPED) if (rc_service_state (svc) & RC_SERVICE_STOPPED)
rc_schedule_start_service (service, svc); rc_service_schedule_start (service, svc);
} }
} }
} else if (strcmp (optarg, "zap") == 0) { } else if (strcmp (optarg, "zap") == 0) {