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

rc_wait_service -> rc_service_wait

Browse Source
This commit is contained in:
Roy Marples 2007-09-29 17:03:38 +00:00
parent f795cd20f8
commit 7d5c82cf63
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librc.c
View File

@ -615,7 +615,7 @@ void rc_schedule_clear (const char *service)
} }
librc_hidden_def(rc_schedule_clear) librc_hidden_def(rc_schedule_clear)
bool rc_wait_service (const char *service) bool rc_service_wait (const char *service)
{ {
char *svc; char *svc;
char *base; char *base;
@ -658,7 +658,7 @@ bool rc_wait_service (const char *service)
free (fifo); free (fifo);
return (retval); return (retval);
} }
librc_hidden_def(rc_wait_service) librc_hidden_def(rc_service_wait)
char **rc_services_in_runlevel (const char *runlevel) char **rc_services_in_runlevel (const char *runlevel)
{ {

2
src/librc.h
View File

@ -93,6 +93,7 @@ librc_hidden_proto(rc_service_mark)
librc_hidden_proto(rc_service_resolve) librc_hidden_proto(rc_service_resolve)
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_services_in_runlevel) librc_hidden_proto(rc_services_in_runlevel)
librc_hidden_proto(rc_services_in_state) librc_hidden_proto(rc_services_in_state)
librc_hidden_proto(rc_services_scheduled) librc_hidden_proto(rc_services_scheduled)
@ -112,7 +113,6 @@ librc_hidden_proto(rc_strlist_delete)
librc_hidden_proto(rc_strlist_free) librc_hidden_proto(rc_strlist_free)
librc_hidden_proto(rc_strlist_join) librc_hidden_proto(rc_strlist_join)
librc_hidden_proto(rc_strlist_reverse) librc_hidden_proto(rc_strlist_reverse)
librc_hidden_proto(rc_wait_service)
librc_hidden_proto(rc_waitpid) librc_hidden_proto(rc_waitpid)
librc_hidden_proto(rc_xmalloc) librc_hidden_proto(rc_xmalloc)
librc_hidden_proto(rc_xrealloc) librc_hidden_proto(rc_xrealloc)

2
src/rc.h
View File

@ -129,7 +129,7 @@ void rc_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
* @return true if service finished before timeout, otherwise false */ * @return true if service finished before timeout, otherwise false */
bool rc_wait_service (const char *service); bool rc_service_wait (const char *service);
/*! Return a saved value for a service /*! Return a saved value for a service
* @param service to check * @param service to check

8
src/runscript.c
View File

@ -650,7 +650,7 @@ static void svc_start (bool deps)
continue; continue;
} }
if (! rc_wait_service (svc)) if (! rc_service_wait (svc))
eerror ("%s: timed out waiting for %s", applet, svc); eerror ("%s: timed out waiting for %s", applet, svc);
if ((svcs = rc_service_state (svc)) & RC_SERVICE_STARTED) if ((svcs = rc_service_state (svc)) & RC_SERVICE_STARTED)
continue; continue;
@ -842,7 +842,7 @@ static void svc_stop (bool deps)
if (svcs & RC_SERVICE_STARTED || if (svcs & RC_SERVICE_STARTED ||
svcs & RC_SERVICE_INACTIVE) svcs & RC_SERVICE_INACTIVE)
{ {
rc_wait_service (svc); rc_service_wait (svc);
svcs = rc_service_state (svc); svcs = rc_service_state (svc);
if (svcs & RC_SERVICE_STARTED || if (svcs & RC_SERVICE_STARTED ||
svcs & RC_SERVICE_INACTIVE) svcs & RC_SERVICE_INACTIVE)
@ -862,7 +862,7 @@ static void svc_stop (bool deps)
continue; continue;
/* We used to loop 3 times here - maybe re-do this if needed */ /* We used to loop 3 times here - maybe re-do this if needed */
rc_wait_service (svc); rc_service_wait (svc);
if (! (rc_service_state (svc) & RC_SERVICE_STOPPED)) { if (! (rc_service_state (svc) & RC_SERVICE_STOPPED)) {
if (rc_runlevel_stopping ()) { if (rc_runlevel_stopping ()) {
/* If shutting down, we should stop even if a dependant failed */ /* If shutting down, we should stop even if a dependant failed */
@ -890,7 +890,7 @@ static void svc_stop (bool deps)
STRLIST_FOREACH (services, svc, i) { STRLIST_FOREACH (services, svc, i) {
if (rc_service_state (svc) & RC_SERVICE_STOPPED) if (rc_service_state (svc) & RC_SERVICE_STOPPED)
continue; continue;
rc_wait_service (svc); rc_service_wait (svc);
} }
rc_strlist_free (services); rc_strlist_free (services);