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

8
src/librc/librc-depend.c
View File

@@ -522,24 +522,24 @@ RC_STRINGLIST *rc_deptree_order(const RC_DEPTREE *deptree,
list = rc_services_in_state(RC_SERVICE_STARTED);
list2 = rc_services_in_state (RC_SERVICE_INACTIVE);
TAILQ_CONCAT(list, list2);
TAILQ_CONCAT(list, list2, entries);
free(list2);
list2 = rc_services_in_state (RC_SERVICE_STARTING);
TAILQ_CONCAT(list, list2);
TAILQ_CONCAT(list, list2, entries);
free(list2);
} else {
list = rc_services_in_runlevel (runlevel);
/* Add coldplugged services */
list2 = rc_services_in_state (RC_SERVICE_COLDPLUGGED);
TAILQ_CONCAT(list, list2);
TAILQ_CONCAT(list, list2, entries);
free(list2);
/* If we're not the boot runlevel then add that too */
if (strcmp (runlevel, bootlevel) != 0) {
list2 = rc_services_in_runlevel (bootlevel);
TAILQ_CONCAT(list, list2);
TAILQ_CONCAT(list, list2, entries);
free(list2);
}
}

6
src/librc/librc.c
View File

@@ -839,13 +839,13 @@ RC_STRINGLIST *rc_services_in_runlevel(const char *runlevel)
#ifdef RC_PKG_INITDIR
if (pkg) {
TAILQ_CONCAT(list, pkg);
TAILQ_CONCAT(list, pkg, entries);
free(pkg);
}
#endif
#ifdef RC_LOCAL_DIR
if (local) {
TAILQ_CONCAT(list, local);
TAILQ_CONCAT(list, local, entries);
free(local);
}
#endif
@@ -883,7 +883,7 @@ RC_STRINGLIST *rc_services_in_state(RC_SERVICE state)
p = rc_strcatpaths(dir, d->value, (char *) NULL);
services = ls_dir(p, LS_INITD);
free(p);
TAILQ_CONCAT(list, services);
TAILQ_CONCAT(list, services, entries);
free(services);
}
rc_stringlist_free(dirs);