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>

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index 025f13b6afa1bd8e32606da013f6dc2a15f4f667..ab508ec8df5b253ca7617c670693e0dbb22e2e61 100644 (file)
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -57,7 +57,7 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
        for (pos++; pos;) {
                char *cl_name, *cl_value;
 
-               pos = conf_get_param_pair(pos, &cl_name, &cl_value, ' ');
+               pos = conf_get_pair_equal(conf, pos, &cl_name, &cl_value, ' ');
 
                if (!cl_name) {
                        args = talloc_asprintf_append(args, "%s ", cl_value);

diff --git a/discover/parser-conf.c b/discover/parser-conf.c
index 6926a92a3fc3b836f51353ec71d3f9b920c43812..a21efc4aced845e10fec38469e9abcc72bc85ed9 100644 (file)
--- a/discover/parser-conf.c
+++ b/discover/parser-conf.c
@@ -74,11 +74,12 @@ char *conf_replace_char(char *s, char from, char to)
 }
 
 /**
- * conf_get_param_pair - Get the next 'name=value' parameter pair.
+ * conf_get_pair - Get the next 'name/value' parameter pair.
  * @str: The string to process.
  * @name_out: Returns a pointer to the name.
  * @value_out: Returns a pointer to the value.
- * @terminator: The pair separator/terminator.
+ * @tdelimiter: The pair separator.
+ * @terminator: The pair terminator.
  *
  * Parses a name=value pair returning pointers in @name_out and @value_out.
  * The pair can be terminated by @terminator or a zero.
@@ -91,18 +92,27 @@ char *conf_replace_char(char *s, char from, char to)
  * string.
  */
 
-char *conf_get_param_pair(char *str, char **name_out, char **value_out,
-               char terminator)
+char *conf_get_pair(struct conf_context __attribute__((unused)) *conf, char *str,
+       char **name_out, char **value_out, char delimiter, char terminator)
 {
        char *sep, *end;
 
+       *name_out = *value_out = NULL;
+
        /* terminate the value */
        end = strchr(str, terminator);
 
        if (end)
                *end = 0;
 
-       sep = strchr(str, '=');
+       conf_replace_char(str, '\t', ' ');
+
+       str = conf_strip_str(str);
+
+       if (!str)
+               goto exit;
+
+       sep = strchr(str, delimiter);
 
        if (!sep) {
                *name_out = NULL;
@@ -113,6 +123,7 @@ char *conf_get_param_pair(char *str, char **name_out, char **value_out,
                *value_out = conf_strip_str(sep + 1);
        }
 
+exit:
        pb_log("%s: @%s@%s@\n", __func__, *name_out, *value_out);
 
        return end ? end + 1 : NULL;
@@ -207,7 +218,7 @@ static void conf_parse_buf(struct conf_context *conf)
        char *pos, *name, *value;
 
        for (pos = conf->buf; pos;) {
-               pos = conf_get_param_pair(pos, &name, &value, '\n');
+               pos = conf_get_pair_equal(conf, pos, &name, &value, '\n');
 
                if (!value)
                        continue;

diff --git a/discover/parser-conf.h b/discover/parser-conf.h
index 66013f34b2b27ea9e3c447ace788effef87ab705..6aa0701bd6e72b50bb3b9232b5184062194fc3d6 100644 (file)
--- 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);