summaryrefslogtreecommitdiffstats
path: root/discover/parser-conf.h
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2012-03-18 16:09:16 -0700
committerGeoff Levand <geoff@infradead.org>2012-03-18 16:09:16 -0700
commit60384121c27eb92c25955a06e8dea088290f938b (patch)
tree7d0687b0ffc4b91320979280cce42d1f3116de6d /discover/parser-conf.h
parent59c55e2b636c0f877d36dbd158ede80a6dbf7ae3 (diff)
downloadtalos-petitboot-60384121c27eb92c25955a06e8dea088290f938b.tar.gz
talos-petitboot-60384121c27eb92c25955a06e8dea088290f938b.zip
Refactor parser routine conf_get_param_pair()
Refactor conf_get_param_pair() and rename to conf_get_pair(). Add two new wrapper routines conf_get_pair_equal() and conf_get_pair_space(). Signed-off-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'discover/parser-conf.h')
-rw-r--r--discover/parser-conf.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/discover/parser-conf.h b/discover/parser-conf.h
index 66013f3..6aa0701 100644
--- a/discover/parser-conf.h
+++ b/discover/parser-conf.h
@@ -39,14 +39,26 @@ struct conf_context {
};
int conf_parse(struct conf_context *conf);
-char *conf_get_param_pair(char *str, char **name_out, char **value_out,
- char terminator);
+char *conf_get_pair(struct conf_context *conf, char *str, char **name_out,
+ char **value_out, char delimiter, char terminator);
void conf_init_global_options(struct conf_context *conf);
const char *conf_get_global_option(struct conf_context *conf,
const char *name);
int conf_set_global_option(struct conf_context *conf, const char *name,
const char *value);
+static inline char *conf_get_pair_equal(struct conf_context *conf, char *str,
+ char **name_out, char **value_out, char terminator)
+{
+ return conf_get_pair(conf, str, name_out, value_out, '=', terminator);
+}
+
+static inline char *conf_get_pair_space(struct conf_context *conf, char *str,
+ char **name_out, char **value_out, char terminator)
+{
+ return conf_get_pair(conf, str, name_out, value_out, ' ', terminator);
+}
+
/* utility routines */
int conf_param_in_list(const char *const *list, const char *param);
OpenPOWER on IntegriCloud