From 71d98c150f6242fcf1b8a5845e46db56caad3885 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 11 Apr 2018 16:07:20 +0200 Subject: Don't split dependencies into argument vector, keep list of strings Signed-off-by: David Oberhollenzer --- lib/src/svc_tsort.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'lib/src/svc_tsort.c') diff --git a/lib/src/svc_tsort.c b/lib/src/svc_tsort.c index dcd1b4c..5f83fa0 100644 --- a/lib/src/svc_tsort.c +++ b/lib/src/svc_tsort.c @@ -24,21 +24,20 @@ static bool has_dependencies(service_t *list, service_t *svc) { - size_t i; + const char *ptr; + int i; while (list != NULL) { - if (svc->after != NULL) { - for (i = 0; svc->after[i] != NULL; ++i) { - if (!strcmp(svc->after[i], list->name)) - return true; - } + for (ptr = svc->after, i = 0; i < svc->num_after; ++i) { + if (!strcmp(ptr, list->name)) + return true; + ptr += strlen(ptr) + 1; } - if (list->before != NULL) { - for (i = 0; list->before[i] != NULL; ++i) { - if (!strcmp(list->before[i], svc->name)) - return true; - } + for (ptr = list->before, i = 0; i < list->num_before; ++i) { + if (!strcmp(ptr, svc->name)) + return true; + ptr += strlen(ptr) + 1; } list = list->next; -- cgit v1.2.3