diff options
| author | Roy Marples <roy@marples.name> | 2007-09-29 17:03:38 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-09-29 17:03:38 +0000 |
| commit | 7d5c82cf63a6cbd2088fb6277b79a2d807710868 (patch) | |
| tree | 8609b29b76f0d78f440f740b810551f0b96aab8d /src | |
| parent | f795cd20f86fc27cdbcfaf405eb6e572c10dc353 (diff) | |
rc_wait_service -> rc_service_wait
Diffstat (limited to 'src')
| -rw-r--r-- | src/librc.c | 4 | ||||
| -rw-r--r-- | src/librc.h | 2 | ||||
| -rw-r--r-- | src/rc.h | 2 | ||||
| -rw-r--r-- | src/runscript.c | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/librc.c b/src/librc.c index e295fb63..00493d8d 100644 --- a/src/librc.c +++ b/src/librc.c @@ -615,7 +615,7 @@ void rc_schedule_clear (const char *service) } librc_hidden_def(rc_schedule_clear) -bool rc_wait_service (const char *service) +bool rc_service_wait (const char *service) { char *svc; char *base; @@ -658,7 +658,7 @@ bool rc_wait_service (const char *service) free (fifo); return (retval); } -librc_hidden_def(rc_wait_service) +librc_hidden_def(rc_service_wait) char **rc_services_in_runlevel (const char *runlevel) { diff --git a/src/librc.h b/src/librc.h index b5ef1fce..84fe5a7a 100644 --- a/src/librc.h +++ b/src/librc.h @@ -93,6 +93,7 @@ librc_hidden_proto(rc_service_mark) librc_hidden_proto(rc_service_resolve) librc_hidden_proto(rc_service_start) 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_state) 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_join) librc_hidden_proto(rc_strlist_reverse) -librc_hidden_proto(rc_wait_service) librc_hidden_proto(rc_waitpid) librc_hidden_proto(rc_xmalloc) librc_hidden_proto(rc_xrealloc) @@ -129,7 +129,7 @@ void rc_schedule_clear (const char *service); /*! Wait for a service to finish * @param service to wait for * @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 * @param service to check diff --git a/src/runscript.c b/src/runscript.c index 9f6c41be..31138f48 100644 --- a/src/runscript.c +++ b/src/runscript.c @@ -650,7 +650,7 @@ static void svc_start (bool deps) continue; } - if (! rc_wait_service (svc)) + if (! rc_service_wait (svc)) eerror ("%s: timed out waiting for %s", applet, svc); if ((svcs = rc_service_state (svc)) & RC_SERVICE_STARTED) continue; @@ -842,7 +842,7 @@ static void svc_stop (bool deps) if (svcs & RC_SERVICE_STARTED || svcs & RC_SERVICE_INACTIVE) { - rc_wait_service (svc); + rc_service_wait (svc); svcs = rc_service_state (svc); if (svcs & RC_SERVICE_STARTED || svcs & RC_SERVICE_INACTIVE) @@ -862,7 +862,7 @@ static void svc_stop (bool deps) continue; /* 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_runlevel_stopping ()) { /* 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) { if (rc_service_state (svc) & RC_SERVICE_STOPPED) continue; - rc_wait_service (svc); + rc_service_wait (svc); } rc_strlist_free (services); |