From 579e48edbb3d897e04bcf50ef630cab597fe6d84 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 17 Feb 2014 22:37:43 +0100
Subject: util/StringUtil: add function Strip()

Replaces g_strstrip().
---
 src/tag/TagConfig.cxx | 5 ++---
 src/tag/TagId3.cxx    | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/tag')

diff --git a/src/tag/TagConfig.cxx b/src/tag/TagConfig.cxx
index 3e941c8d9..00f20d1c0 100644
--- a/src/tag/TagConfig.cxx
+++ b/src/tag/TagConfig.cxx
@@ -26,8 +26,7 @@
 #include "system/FatalError.hxx"
 #include "util/Alloc.hxx"
 #include "util/ASCII.hxx"
-
-#include <glib.h>
+#include "util/StringUtil.hxx"
 
 #include <algorithm>
 
@@ -54,7 +53,7 @@ TagLoadConfig()
 				quit = true;
 			*s = '\0';
 
-			c = g_strstrip(c);
+			c = Strip(c);
 			if (*c == 0)
 				continue;
 
diff --git a/src/tag/TagId3.cxx b/src/tag/TagId3.cxx
index 4ecd4baa6..d2d84a1bf 100644
--- a/src/tag/TagId3.cxx
+++ b/src/tag/TagId3.cxx
@@ -22,6 +22,7 @@
 #include "TagHandler.hxx"
 #include "TagTable.hxx"
 #include "TagBuilder.hxx"
+#include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
@@ -116,7 +117,7 @@ import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4)
 	}
 
 	id3_utf8_t *utf8_stripped = (id3_utf8_t *)
-		g_strdup(g_strstrip((gchar *)utf8));
+		g_strdup(Strip((char *)utf8));
 	free(utf8);
 
 	return utf8_stripped;
-- 
cgit v1.2.3