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

No need to check type twice like this.

Browse Source
This commit is contained in:
Roy Marples 2008-06-04 12:47:06 +00:00
parent 83ade5b701
commit e6aed12328
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,10 +178,15 @@ rc_deptree_load(void)
librc_hidden_def(rc_deptree_load) librc_hidden_def(rc_deptree_load)
static bool static bool
valid_service(const char *runlevel, const char *service) valid_service(const char *runlevel, const char *service, const char *type)
{ {
RC_SERVICE state = rc_service_state(service); RC_SERVICE state;
if (strcmp(type, "ineed") == 0 ||
strcmp(type, "needsme") == 0)
return true;
state = rc_service_state(service);
return ((strcmp(runlevel, bootlevel) != 0 && return ((strcmp(runlevel, bootlevel) != 0 &&
rc_service_in_runlevel(service, bootlevel)) || rc_service_in_runlevel(service, bootlevel)) ||
rc_service_in_runlevel(service, runlevel) || rc_service_in_runlevel(service, runlevel) ||
@ -387,18 +392,12 @@ visit_service(const RC_DEPTREE *deptree,
if (TAILQ_FIRST(provided)) { if (TAILQ_FIRST(provided)) {
TAILQ_FOREACH(p, provided, entries) { TAILQ_FOREACH(p, provided, entries) {
di = get_depinfo(deptree, p->value); di = get_depinfo(deptree, p->value);
if (di && if (di && valid_service(runlevel, di->service, type->value))
(strcmp(type->value, "ineed") == 0 ||
strcmp(type->value, "needsme") == 0 ||
valid_service(runlevel, di->service)))
visit_service(deptree, types, sorted, visited, di, visit_service(deptree, types, sorted, visited, di,
runlevel, options | RC_DEP_TRACE); runlevel, options | RC_DEP_TRACE);
} }
} }
else if (di && else if (di && valid_service(runlevel, service->value, type->value))
(strcmp(type->value, "ineed") == 0 ||
strcmp(type->value, "needsme") == 0 ||
valid_service(runlevel, service->value)))
visit_service(deptree, types, sorted, visited, di, visit_service(deptree, types, sorted, visited, di,
runlevel, options | RC_DEP_TRACE); runlevel, options | RC_DEP_TRACE);