Refactor parser routine conf_get_param_pair()

[petitboot] / discover / parser-conf.h

diff --git a/discover/parser-conf.h b/discover/parser-conf.h
index 3325faf4f3f8331731d2e3271c50fc863ce94885..6aa0701bd6e72b50bb3b9232b5184062194fc3d6 100644 (file)
--- a/discover/parser-conf.h
+++ b/discover/parser-conf.h
@@ -39,17 +39,30 @@ 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);
 char *conf_strip_str(char *s);
+char *conf_replace_char(char *s, char from, char to);
 
 #endif