diff options
| author | Roy Marples <roy@marples.name> | 2007-10-03 14:18:52 +0000 | 
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-10-03 14:18:52 +0000 | 
| commit | 563c6f46c0439eeb3fcc90105264ae1043b7298f (patch) | |
| tree | 99dbf403e0036872bc17a03bfaa7556c355f7888 /src | |
| parent | 4c3bf59c5bc6b1ff10b61263bf9347e3cf918f4a (diff) | |
| download | openrc-563c6f46c0439eeb3fcc90105264ae1043b7298f.tar.xz | |
rc_schedule_clear -> rc_service_schedule_clear, rc_schedule_start_service -> rc_service_schedule_start
Diffstat (limited to 'src')
| -rw-r--r-- | src/librc.c | 10 | ||||
| -rw-r--r-- | src/librc.h | 4 | ||||
| -rw-r--r-- | src/rc.h | 4 | ||||
| -rw-r--r-- | src/runscript.c | 8 | 
4 files changed, 13 insertions, 13 deletions
| diff --git a/src/librc.c b/src/librc.c index 85e2c177..fd069abc 100644 --- a/src/librc.c +++ b/src/librc.c @@ -378,7 +378,7 @@ bool rc_service_mark (const char *service, const rc_service_state_t state)  			rc_rm_dir (dir, true);  		free (dir); -		rc_schedule_clear (service); +		rc_service_schedule_clear (service);  	}  	/* 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) -bool rc_schedule_start_service (const char *service, +bool rc_service_schedule_start (const char *service,  								const char *service_to_start)  {  	char *dir; @@ -600,9 +600,9 @@ bool rc_schedule_start_service (const char *service,  	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 *dir = rc_strcatpaths (RC_SVCDIR, "scheduled", basename (svc), @@ -613,7 +613,7 @@ void rc_schedule_clear (const char *service)  		rc_rm_dir (dir, true);  	free (dir);  } -librc_hidden_def(rc_schedule_clear) +librc_hidden_def(rc_service_schedule_clear)  bool rc_service_wait (const char *service)  { diff --git a/src/librc.h b/src/librc.h index f8358275..bba06991 100644 --- a/src/librc.h +++ b/src/librc.h @@ -79,8 +79,6 @@ librc_hidden_proto(rc_runlevel_list)  librc_hidden_proto(rc_runlevel_set)  librc_hidden_proto(rc_runlevel_starting)  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_daemons_crashed)  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_plugable)  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_stop)  librc_hidden_proto(rc_service_wait) @@ -110,7 +110,7 @@ pid_t rc_service_stop (const char *service);  /*! Schedule a service to be started when another service starts   * @param service that starts the scheduled service when 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);  /*! Return a NULL terminated list of services that are scheduled to start   * 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   * @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   * @param service to wait for diff --git a/src/runscript.c b/src/runscript.c index 6604fd84..60268970 100644 --- a/src/runscript.c +++ b/src/runscript.c @@ -237,7 +237,7 @@ static void start_services (char **list) {  				if (state & RC_SERVICE_INACTIVE ||  					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",  						   svc, applet);  				} else @@ -680,7 +680,7 @@ static void svc_start (bool deps)  			types = NULL;  			rc_strlist_add (&types, "iprovide");  			STRLIST_FOREACH (tmplist, svc, i) { -				rc_schedule_start_service (svc, service); +				rc_service_schedule_start (svc, service);  				rc_strlist_free (svclist);  				svclist = NULL; @@ -689,7 +689,7 @@ static void svc_start (bool deps)  				providelist = rc_deptree_depends (deptree, types, svclist,  											  softlevel, depoptions);  				STRLIST_FOREACH (providelist, svc2, j)  -					rc_schedule_start_service (svc2, service); +					rc_service_schedule_start (svc2, service);  				len += strlen (svc) + 2;  				n++; @@ -1244,7 +1244,7 @@ int runscript (int argc, char **argv)  						int j;  						STRLIST_FOREACH (restart_services, svc, j)  							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) { | 
