From 9974f2d82b9450eaccd7661b3bfabb686ab8e161 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 17 May 2013 13:55:18 +0800 Subject: 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 --- discover/parser.c | 36 +++++++++++++++++++++--------------- test/parser/utils.c | 34 ++++++++++++++++------------------ 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/discover/parser.c b/discover/parser.c index 3153a65..e2940e1 100644 --- a/discover/parser.c +++ b/discover/parser.c @@ -13,8 +13,12 @@ #include "parser-utils.h" #include "paths.h" -static int n_parsers; -static struct parser **parsers; +struct p_item { + struct list_item list; + struct parser *parser; +}; + +STATIC_LIST(parsers); static const int max_file_size = 1024 * 1024; @@ -126,19 +130,20 @@ static void iterate_parser_files(struct discover_context *ctx, void iterate_parsers(struct discover_context *ctx, enum conf_method method) { - int rc, i, len; + struct p_item* i; + int rc, len; char *buf; pb_log("trying parsers for %s\n", ctx->device->device->id); switch (method) { case CONF_METHOD_LOCAL_FILE: - for (i = 0; i < n_parsers; i++) { - if (parsers[i]->method != CONF_METHOD_LOCAL_FILE) + list_for_each_entry(&parsers, i, list) { + if (i->parser->method != CONF_METHOD_LOCAL_FILE) continue; - pb_log("\ttrying parser '%s'\n", parsers[i]->name); - ctx->parser = parsers[i]; + pb_log("\ttrying parser '%s'\n", i->parser->name); + ctx->parser = i->parser; iterate_parser_files(ctx, ctx->parser); } ctx->parser = NULL; @@ -151,13 +156,13 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method) return; } - for (i = 0; i < n_parsers; i++) { - if (parsers[i]->method != method) + list_for_each_entry(&parsers, i, list) { + if (i->parser->method != method) continue; - pb_log("\ttrying parser '%s'\n", parsers[i]->name); - ctx->parser = parsers[i]; - parsers[i]->parse(ctx, buf, len); + pb_log("\ttrying parser '%s'\n", i->parser->name); + ctx->parser = i->parser; + i->parser->parse(ctx, buf, len); } break; @@ -170,9 +175,10 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method) 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); } void parser_init(void) 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, -- cgit v1.1