From 39e06f5cfda0ed0c1eeb7a7604a3d05dda81ccf1 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 12 Mar 2013 15:30:41 +0800 Subject: parsers: Add filenames to struct parser In preparation of moving file handling to the discover core (rather than the parsers), include the conf file names in struct parser. Signed-off-by: Jeremy Kerr --- discover/grub2-parser.c | 6 +++++- discover/kboot-parser.c | 6 +++++- discover/parser.h | 5 +++-- discover/yaboot-parser.c | 6 +++++- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/discover/grub2-parser.c b/discover/grub2-parser.c index fa7b950..6ef5945 100644 --- a/discover/grub2-parser.c +++ b/discover/grub2-parser.c @@ -188,4 +188,8 @@ static int grub2_parse(struct discover_context *dc) return rc; } -define_parser(grub2, grub2_parse); +struct parser __grub2_parser = { + .name = "grub2", + .parse = grub2_parse, + .filenames = grub2_conf_files, +}; diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c index 5d5090b..c828e30 100644 --- a/discover/kboot-parser.c +++ b/discover/kboot-parser.c @@ -157,4 +157,8 @@ static int kboot_parse(struct discover_context *dc) return rc; } -define_parser(kboot, kboot_parse); +struct parser __kboot_parser = { + .name = "kboot", + .parse = kboot_parse, + .filenames = kboot_conf_files, +}; diff --git a/discover/parser.h b/discover/parser.h index 9f98368..c2f02d6 100644 --- a/discover/parser.h +++ b/discover/parser.h @@ -4,8 +4,9 @@ struct discover_context; struct parser { - char *name; - int (*parse)(struct discover_context *ctx); + char *name; + const char * const *filenames; + int (*parse)(struct discover_context *ctx); }; enum generic_icon_type { diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c index b287817..0477d38 100644 --- a/discover/yaboot-parser.c +++ b/discover/yaboot-parser.c @@ -320,4 +320,8 @@ static int yaboot_parse(struct discover_context *dc) return rc; } -define_parser(yaboot, yaboot_parse); +struct parser __yaboot_parser = { + .name = "yaboot", + .parse = yaboot_parse, + .filenames = yaboot_conf_files, +}; -- cgit v1.2.1