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

Use correct TAILQ_CONCAT macro when not defined.

Browse Source
This commit is contained in:
Roy Marples
2008-03-16 17:27:13 +00:00
parent 1fd1472dde
commit 40930d7d0a
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rc/rc-misc.c
View File

@@ -79,7 +79,7 @@ char *rc_conf_value(const char *setting)
if (exists(RC_CONF_OLD)) {
old = rc_config_load(RC_CONF_OLD);
if (old) {
TAILQ_CONCAT(rc_conf, old);
TAILQ_CONCAT(rc_conf, old, entries);
free(old);
}
}

6
src/rc/rc.c
View File

@@ -951,10 +951,10 @@ int main(int argc, char **argv)
* correct order for stopping them */
stop_services = rc_services_in_state(RC_SERVICE_STARTED);
tmplist = rc_services_in_state(RC_SERVICE_INACTIVE);
TAILQ_CONCAT(stop_services, tmplist);
TAILQ_CONCAT(stop_services, tmplist, entries);
free(tmplist);
tmplist = rc_services_in_state(RC_SERVICE_STARTING);
TAILQ_CONCAT(stop_services, tmplist);
TAILQ_CONCAT(stop_services, tmplist, entries);
free(tmplist);
rc_stringlist_sort(&stop_services);
@@ -981,7 +981,7 @@ int main(int argc, char **argv)
start_services = rc_services_in_runlevel(bootlevel);
if (strcmp (newlevel ? newlevel : runlevel, bootlevel) != 0) {
tmplist = rc_services_in_runlevel(newlevel ? newlevel : runlevel);
TAILQ_CONCAT(start_services, tmplist);
TAILQ_CONCAT(start_services, tmplist, entries);
free(tmplist);
}

2
src/rc/runscript.c
View File

@@ -627,7 +627,7 @@ static void get_started_services(void)
RC_STRINGLIST *tmp = rc_services_in_state(RC_SERVICE_INACTIVE);
rc_stringlist_free(restart_services);
restart_services = rc_services_in_state(RC_SERVICE_STARTED);
TAILQ_CONCAT(restart_services, tmp);
TAILQ_CONCAT(restart_services, tmp, entries);
free(tmp);
}