From 40930d7d0a613aaf6fa124a5963afcae0c30ce7a Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Sun, 16 Mar 2008 17:27:13 +0000 Subject: Use correct TAILQ_CONCAT macro when not defined. --- src/rc/rc-misc.c | 2 +- src/rc/rc.c | 6 +++--- src/rc/runscript.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/rc') diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c index 3167f26b..7c5d1014 100644 --- a/src/rc/rc-misc.c +++ b/src/rc/rc-misc.c @@ -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); } } diff --git a/src/rc/rc.c b/src/rc/rc.c index 6a6aa0a4..6754d2d3 100644 --- a/src/rc/rc.c +++ b/src/rc/rc.c @@ -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); } diff --git a/src/rc/runscript.c b/src/rc/runscript.c index cfc2611a..e7a094f8 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -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); } -- cgit v1.2.3