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>

diff --git a/discover/parser.c b/discover/parser.c
index 3153a657c7528f729e3341972f02fae91783496f..e2940e19e1b939a3aaaaf2dca45b28d8a02e418b 100644 (file)
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -13,8 +13,12 @@
 #include "parser-utils.h"
 #include "paths.h"
 
 #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;
 
 
 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)
 {
 
 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:
        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;
 
                                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;
                        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;
                }
 
                        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;
 
                                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;
                }
 
                break;


@@ -170,9 +175,10 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 
 void __register_parser(struct parser *parser)
 {
 
 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)
 }
 
 void parser_init(void)

diff --git a/test/parser/utils.c b/test/parser/utils.c
index 9df3a7fb67eda09dd861a53213662d370fc54752..68fc3debb333baf36cc2560dc8668393d0effe3e 100644 (file)
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -17,14 +17,19 @@
 
 #include "parser-test.h"
 
 
 #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)
 {
 
 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(
 }
 
 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)
 {
 
 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;
                        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,
 }
 
 bool resource_resolve(struct device_handler *handler, struct parser *parser,