summaryrefslogtreecommitdiffstats
path: root/test/parser/utils.c
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2013-05-17 13:55:18 +0800
committerGeoff Levand <geoff@infradead.org>2013-05-17 17:44:29 +0800
commit9974f2d82b9450eaccd7661b3bfabb686ab8e161 (patch)
tree1c0c5e858cfa5eed7dbfbdb595655ab1380bcf61 /test/parser/utils.c
parente1a6f62162716511956417e6c103de37ce9c71d2 (diff)
downloadtalos-petitboot-9974f2d82b9450eaccd7661b3bfabb686ab8e161.tar.gz
talos-petitboot-9974f2d82b9450eaccd7661b3bfabb686ab8e161.zip
parser: Use list to hold parsers
Now that we dynamically add parsers, we can use a list to hold them. Also simplifies the test_run_parser() routine. Signed-off-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'test/parser/utils.c')
-rw-r--r--test/parser/utils.c34
1 files changed, 16 insertions, 18 deletions
diff --git a/test/parser/utils.c b/test/parser/utils.c
index 9df3a7f..68fc3de 100644
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -17,14 +17,19 @@
#include "parser-test.h"
-static int n_parsers;
-static struct parser **parsers;
+struct p_item {
+ struct list_item list;
+ struct parser *parser;
+};
+
+STATIC_LIST(parsers);
void __register_parser(struct parser *parser)
{
- parsers = talloc_realloc(NULL, parsers, struct parser *, n_parsers + 1);
- parsers[n_parsers] = parser;
- n_parsers++;
+ struct p_item* i = talloc(NULL, struct p_item);
+
+ i->parser = parser;
+ list_add(&parsers, &i->list);
}
static struct discover_device *test_create_device_simple(
@@ -122,23 +127,16 @@ void test_read_conf_file(struct parser_test *test, const char *filename)
int test_run_parser(struct parser_test *test, const char *parser_name)
{
- struct parser *parser;
- int i, rc = 0;
+ struct p_item* i;
- for (i = 0; i < n_parsers; i++) {
- parser = parsers[i];
- if (strcmp(parser->name, parser_name))
+ list_for_each_entry(&parsers, i, list) {
+ if (strcmp(i->parser->name, parser_name))
continue;
- test->ctx->parser = parser;
- rc = parser->parse(test->ctx, test->conf.buf, test->conf.size);
- break;
+ test->ctx->parser = i->parser;
+ return i->parser->parse(test->ctx, test->conf.buf, test->conf.size);
}
- if (i == n_parsers)
- errx(EXIT_FAILURE, "%s: parser '%s' not found",
- __func__, parser_name);
-
- return rc;
+ errx(EXIT_FAILURE, "%s: parser '%s' not found", __func__, parser_name);
}
bool resource_resolve(struct device_handler *handler, struct parser *parser,
OpenPOWER on IntegriCloud