diff options
| author | Roy Marples <roy@marples.name> | 2008-03-16 17:27:13 +0000 | 
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-03-16 17:27:13 +0000 | 
| commit | 40930d7d0a613aaf6fa124a5963afcae0c30ce7a (patch) | |
| tree | 89b379b4fe5a20a061c05881b75ad93276d80d08 /src/librc | |
| parent | 1fd1472ddeb4a9e248bd20a378091ffe6f1132b6 (diff) | |
| download | openrc-40930d7d0a613aaf6fa124a5963afcae0c30ce7a.tar.xz | |
Use correct TAILQ_CONCAT macro when not defined.
Diffstat (limited to 'src/librc')
| -rw-r--r-- | src/librc/librc-depend.c | 8 | ||||
| -rw-r--r-- | src/librc/librc.c | 6 | 
2 files changed, 7 insertions, 7 deletions
| diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index 8617d753..7038a3fc 100644 --- a/src/librc/librc-depend.c +++ b/src/librc/librc-depend.c @@ -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);  		}  	} diff --git a/src/librc/librc.c b/src/librc/librc.c index 301a388a..dfee0bfc 100644 --- a/src/librc/librc.c +++ b/src/librc/librc.c @@ -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); | 
