diff options
| author | Roy Marples <roy@marples.name> | 2007-09-18 14:08:56 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-09-18 14:08:56 +0000 |
| commit | 75b5fdff29d00508dc62ff848e63561bd9fe06a7 (patch) | |
| tree | 3d7137ac93543a23f23af6f3bf15e0d763d91d3e /src/librc-depend.c | |
| parent | c8b03c96b7da55de503c8e3cdab8d49d7358dd17 (diff) | |
| download | openrc-75b5fdff29d00508dc62ff848e63561bd9fe06a7.tar.xz | |
Match the recent api change to rc_strlist_join also. We now free the 2nd list for ease of use.
Diffstat (limited to 'src/librc-depend.c')
| -rw-r--r-- | src/librc-depend.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/librc-depend.c b/src/librc-depend.c index b5c11ad6..32bbf2bd 100644 --- a/src/librc-depend.c +++ b/src/librc-depend.c @@ -493,25 +493,22 @@ char **rc_order_services (rc_depinfo_t *deptree, const char *runlevel, strcmp (runlevel, RC_LEVEL_REBOOT) == 0) { list = rc_ls_dir (RC_SVCDIR_STARTING, RC_LS_INITD); - list = rc_strlist_join (list, - rc_ls_dir (RC_SVCDIR_INACTIVE, RC_LS_INITD)); - list = rc_strlist_join (list, - rc_ls_dir (RC_SVCDIR_STARTED, RC_LS_INITD)); + rc_strlist_join (&list, + rc_ls_dir (RC_SVCDIR_INACTIVE, RC_LS_INITD)); + rc_strlist_join (&list, + rc_ls_dir (RC_SVCDIR_STARTED, RC_LS_INITD)); reverse = true; } else { list = rc_services_in_runlevel (runlevel); /* Add coldplugged services */ - list = rc_strlist_join (list, - rc_ls_dir (RC_SVCDIR_COLDPLUGGED, RC_LS_INITD)); - + rc_strlist_join (&list, rc_ls_dir (RC_SVCDIR_COLDPLUGGED, RC_LS_INITD)); /* If we're not the boot runlevel then add that too */ if (strcmp (runlevel, bootlevel) != 0) { char *path = rc_strcatpaths (RC_RUNLEVELDIR, bootlevel, (char *) NULL); - list = rc_strlist_join (list, - rc_ls_dir (path, RC_LS_INITD)); + rc_strlist_join (&list, rc_ls_dir (path, RC_LS_INITD)); free (path); } } |