X-Git-Url: http://git.droids-corp.org/?p=protos%2Flibecoli.git;a=blobdiff_plain;f=src%2Fecoli_test.c;fp=src%2Fecoli_test.c;h=3e7d62558d89d4c5ffd111d7ef5e0291f5c6d240;hp=4429e679941bc8b34cb10893b821c25574358dc3;hb=67b4d8d2b2593e3e64a848ce548bc0fd76bc440a;hpb=2d4aa6c1bf4bcd98e2686782c0462f82cd1cddde diff --git a/src/ecoli_test.c b/src/ecoli_test.c index 4429e67..3e7d625 100644 --- a/src/ecoli_test.c +++ b/src/ecoli_test.c @@ -129,7 +129,6 @@ int ec_test_check_complete(struct ec_node *tk, enum ec_comp_type type, ...) for (s = va_arg(ap, const char *); s != EC_VA_END; s = va_arg(ap, const char *)) { - struct ec_comp_iter *iter; const struct ec_comp_item *item; if (s == NULL) { @@ -140,8 +139,7 @@ int ec_test_check_complete(struct ec_node *tk, enum ec_comp_type type, ...) count++; /* only check matching completions */ - iter = ec_comp_iter(c, type); - while ((item = ec_comp_iter_next(iter)) != NULL) { + EC_COMP_FOREACH(item, c, type) { const char *str = ec_comp_item_get_str(item); if (str != NULL && strcmp(str, s) == 0) break; @@ -152,7 +150,6 @@ int ec_test_check_complete(struct ec_node *tk, enum ec_comp_type type, ...) "completion <%s> not in list\n", s); ret = -1; } - ec_comp_iter_free(iter); } /* check if we have more completions (or less) than expected */