X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=e2940e19e1b939a3aaaaf2dca45b28d8a02e418b;hp=8d4c180c2c1bccc7a3a43f1da996c09f5b901f65;hb=556e622653c72de9b3eda70995e9f8619ee1c9a1;hpb=7c8683fa009115f8a3b08b7a7666b64ebcbbc1bc

diff --git a/discover/parser.c b/discover/parser.c
index 8d4c180..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;
 
@@ -116,6 +120,8 @@ static void iterate_parser_files(struct discover_context *ctx,
 
 		rc = read_file(ctx, path, &buf, &len);
 		if (!rc) {
+			pb_log("Running parser %s on file %s\n",
+					parser->name, *filename);
 			parser->parse(ctx, buf, len);
 			talloc_free(buf);
 		}
@@ -124,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;
@@ -149,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;
@@ -168,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)