refactor regex filtering code

1 files changed, 13 insertions, 12 deletions

diff --git a/parser.c b/parser.c
index 5ca1810..c32ad27 100644
--- a/parser.c
+++ b/parser.c
@@ -514,33 +514,34 @@ static int Parser_get_unit(char **parameter, char **units)
 	return units_present;
 }
 
+
+static gchar* regex_replace (gchar* in_string, gchar* regex_string, gchar* replace_with)
+{
+	GRegex *regex = g_regex_new (regex_string, 0, 0, NULL);
+	gchar *out = g_regex_replace_literal (regex, in_string, -1, 0, replace_with, 0, NULL);
+	g_regex_unref (regex);
+	return out;
+}
+
 static gchar* filter_input (gchar *raw_in)
 {
 	g_strstrip (raw_in);
 	gchar *step1 = g_strdup (raw_in);
 
 	// replace multiple whitespace with single space
-	GRegex *strip_space = g_regex_new ("\\s+", 0, 0, NULL);
-	gchar *step2 = g_regex_replace_literal (strip_space, step1, -1, 0, " ", 0, NULL);
-	g_regex_unref (strip_space);
+	gchar *step2 = regex_replace (step1, "\\s+", " ");
 	g_free (step1);
 
 	// remove spaces before and after semicolons in compound messages
-	GRegex *semi_space = g_regex_new ("\\s*;\\s*", 0, 0, NULL);
-	gchar *step3 = g_regex_replace_literal (semi_space, step2, -1, 0, ";", 0, NULL);
-	g_regex_unref (semi_space);
+	gchar *step3 = regex_replace (step2, "\\s*;\\s*", ";");
 	g_free (step2);
 
 	// remove semicolon at end
-	GRegex *end_semi = g_regex_new (";$", 0, 0, NULL);
-	gchar *step4 = g_regex_replace_literal (end_semi, step3, -1, 0, "", 0, NULL);
-	g_regex_unref (end_semi);
+	gchar *step4 = regex_replace (step3, ";$", "");
 	g_free (step3);
 
 	// remove leading spaces, colons, semicolons
-	GRegex *leading = g_regex_new ("^[\\s:;]*", 0, 0, NULL);
-	gchar *step5 = g_regex_replace_literal (leading, step4, -1, 0, "", 0, NULL);
-	g_regex_unref (leading);
+	gchar *step5 = regex_replace (step4, "^[\\s:;]*", "");
 	g_free (step4);
 
 	// last step may leave hanging whitespace at end