From 25795d3b6c69a6c96c0bd3fa0d72a1b3dfc175f9 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <jonas.fonseca@gmail.com>
Date: Sun, 9 Nov 2014 00:17:06 -0500
Subject: [PATCH] Make parsing of view column expressions reusable

---
 src/view.c | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/view.c b/src/view.c
index b9c4914..05d9221 100644
--- a/src/view.c
+++ b/src/view.c
@@ -1142,7 +1142,7 @@ view_column_reset(struct view *view)
 }
 
 static enum status_code
-parse_view_column_config(char **pos, const char **name, const char **value, bool first)
+parse_view_column_config_expr(char **pos, const char **name, const char **value, bool first)
 {
 	size_t len = strcspn(*pos, ",");
 	size_t optlen;
@@ -1202,6 +1202,28 @@ parse_view_column_option(struct view_column *column,
 }
 
 static enum status_code
+parse_view_column_config_exprs(struct view_column *column, const char *arg)
+{
+	char buf[SIZEOF_STR] = "";
+	char *pos, *end;
+	bool first = TRUE;
+	enum status_code code = SUCCESS;
+
+	string_ncopy(buf, arg, strlen(arg));
+
+	for (pos = buf, end = pos + strlen(pos); code == SUCCESS && pos <= end; first = FALSE) {
+		const char *name = NULL;
+		const char *value = NULL;
+
+		code = parse_view_column_config_expr(&pos, &name, &value, first);
+		if (code == SUCCESS)
+			code = parse_view_column_option(column, name, value);
+	}
+
+	return code;
+}
+
+static enum status_code
 parse_view_column_type(struct view_column *column, const char **arg)
 {
 	enum view_column_type type;
@@ -1271,17 +1293,7 @@ parse_view_config(const char *view_name, const char *argv[])
 			return error("The %s column must always be last",
 				     view_column_name(column->type));
 
-		string_ncopy(buf, arg, strlen(arg));
-
-		for (pos = buf, end = pos + strlen(pos); code == SUCCESS && pos <= end; first = FALSE) {
-			const char *name = NULL;
-			const char *value = NULL;
-
-			code = parse_view_column_config(&pos, &name, &value, first);
-			if (code == SUCCESS)
-				code = parse_view_column_option(column, name, value);
-		}
-
+		code = parse_view_column_config_exprs(column, arg);
 		column->prev_opt = column->opt;
 	}
 
-- 
2.11.4.GIT