From 7c5e552c210b38a06ed9fbb99418b62e20978666 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 16 Mar 2012 22:06:03 -0700 Subject: Use static array for parsers Change the parser structure array implementation from using an array in a seperate parsers section to a static array of pointers in parser.c. Parser priority is now set by the position in the new parsers array. Signed-off-by: Geoff Levand --- discover/parser.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) (limited to 'discover/parser.c') diff --git a/discover/parser.c b/discover/parser.c index 8f2735c..c106dec 100644 --- a/discover/parser.c +++ b/discover/parser.c @@ -8,39 +8,33 @@ #include "parser.h" #include "parser-utils.h" -extern struct parser __start_parsers[], __stop_parsers[]; +struct parser __native_parser; +struct parser __yaboot_parser; +struct parser __kboot_parser; +struct parser __grub2_parser; + +static const struct parser *const parsers[] = { +// &__native_parser, + &__yaboot_parser, + &__kboot_parser, + NULL +}; void iterate_parsers(struct discover_context *ctx) { - struct parser *parser; + int i; unsigned int count = 0; pb_log("trying parsers for %s\n", ctx->device_path); - for (parser = __start_parsers; parser < __stop_parsers; parser++) { - pb_log("\ttrying parser '%s'\n", parser->name); - count += parser->parse(ctx); + for (i = 0; parsers[i]; i++) { + pb_log("\ttrying parser '%s'\n", parsers[i]->name); + count += parsers[i]->parse(ctx); } if (!count) pb_log("\tno boot_options found\n"); } -static int compare_parsers(const void *a, const void *b) -{ - const struct parser *parser_a = a, *parser_b = b; - - if (parser_a->priority > parser_b->priority) - return -1; - - if (parser_a->priority < parser_b->priority) - return 1; - - return 0; -} - void parser_init(void) { - /* sort our parsers into descending priority order */ - qsort(__start_parsers, __stop_parsers - __start_parsers, - sizeof(struct parser), compare_parsers); } -- cgit v1.2.1