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 <jk@ozlabs.org>

diff --git a/discover/grub2-parser.c b/discover/grub2-parser.c
index fa7b9507348a217d0576adfcd3c33d9fdffc839c..6ef5945b11c999fe87bfa813f821b0453d5d6477 100644 (file)
--- 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 5d5090b46003c509c666b10584b2a996eddcd9a4..c828e3072ba77d41c367bc68e3cb64391f387737 100644 (file)
--- 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 9f98368b5ca417640e9c097d50674f3a71c924e5..c2f02d683d3f50b85b487752ac256f68e9abdc7b 100644 (file)
--- 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 b287817a6727c1d0838661675cf70209430121ce..0477d38ee6e7715e00d70c19c2aa4ff19edf3f4d 100644 (file)
--- 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,
+};