From 60384121c27eb92c25955a06e8dea088290f938b Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Sun, 18 Mar 2012 16:09:16 -0700 Subject: 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 --- discover/parser-conf.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'discover/parser-conf.h') 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); -- cgit v1.2.1