2 files changed, 21 insertions, 37 deletions

diff --git a/src/output/plugins/httpd/HttpdInternal.hxx b/src/output/plugins/httpd/HttpdInternal.hxx
index 20ff15e42..303170268 100644
--- a/src/output/plugins/httpd/HttpdInternal.hxx
+++ b/src/output/plugins/httpd/HttpdInternal.hxx
@@ -153,7 +153,7 @@ public:
 	HttpdOutput(EventLoop &_loop);
 	~HttpdOutput();
 
-#if defined(__clang__) || GCC_CHECK_VERSION(4,7)
+#if CLANG_OR_GCC_VERSION(4,7)
 	constexpr
 #endif
 	static HttpdOutput *Cast(AudioOutput *ao) {
diff --git a/src/output/plugins/httpd/IcyMetaDataServer.cxx b/src/output/plugins/httpd/IcyMetaDataServer.cxx
index 146df23d1..108d4e7ec 100644
--- a/src/output/plugins/httpd/IcyMetaDataServer.cxx
+++ b/src/output/plugins/httpd/IcyMetaDataServer.cxx
@@ -22,8 +22,8 @@
 #include "Page.hxx"
 #include "tag/Tag.hxx"
 #include "util/FormatString.hxx"
-
-#include <glib.h>
+#include "util/StringUtil.hxx"
+#include "util/Macros.hxx"
 
 #include <string.h>
 
@@ -57,16 +57,13 @@ icy_server_metadata_header(const char *name,
 static char *
 icy_server_metadata_string(const char *stream_title, const char* stream_url)
 {
-	gchar *icy_metadata;
-	guint meta_length;
-
 	// The leading n is a placeholder for the length information
-	icy_metadata = FormatNew("nStreamTitle='%s';"
-				 "StreamUrl='%s';",
-				 stream_title,
-				 stream_url);
+	char *icy_metadata = FormatNew("nStreamTitle='%s';"
+				       "StreamUrl='%s';",
+				       stream_title,
+				       stream_url);
 
-	meta_length = strlen(icy_metadata);
+	size_t meta_length = strlen(icy_metadata);
 
 	meta_length--; // subtract placeholder
 
@@ -85,43 +82,30 @@ icy_server_metadata_string(const char *stream_title, const char* stream_url)
 Page *
 icy_server_metadata_page(const Tag &tag, const TagType *types)
 {
-	const gchar *tag_items[TAG_NUM_OF_ITEM_TYPES];
-	gint last_item, item;
-	guint position;
-	gchar *icy_string;
-	gchar stream_title[(1 + 255 - 28) * 16]; // Length + Metadata -
-						 // "StreamTitle='';StreamUrl='';"
-						 // = 4081 - 28
-	stream_title[0] =  '\0';
-
-	last_item = -1;
+	const char *tag_items[TAG_NUM_OF_ITEM_TYPES];
 
+	int last_item = -1;
 	while (*types != TAG_NUM_OF_ITEM_TYPES) {
-		const gchar *tag_item = tag.GetValue(*types++);
+		const char *tag_item = tag.GetValue(*types++);
 		if (tag_item)
 			tag_items[++last_item] = tag_item;
 	}
 
-	position = item = 0;
-	while (position < sizeof(stream_title) && item <= last_item) {
-		gint length = 0;
-
-		length = g_strlcpy(stream_title + position,
-				   tag_items[item++],
-				   sizeof(stream_title) - position);
+	int item = 0;
 
-		position += length;
+	// Length + Metadata - "StreamTitle='';StreamUrl='';" = 4081 - 28
+	char stream_title[(1 + 255 - 28) * 16];
+	char *p = stream_title, *const end = stream_title + ARRAY_SIZE(stream_title);
+	stream_title[0] =  '\0';
 
-		if (item <= last_item) {
-			length = g_strlcpy(stream_title + position,
-					   " - ",
-					   sizeof(stream_title) - position);
+	while (p < end && item <= last_item) {
+		p = CopyString(p, tag_items[item++], end - p);
 
-			position += length;
-		}
+		if (item <= last_item)
+			p = CopyString(p, " - ", end - p);
 	}
 
-	icy_string = icy_server_metadata_string(stream_title, "");
+	char *icy_string = icy_server_metadata_string(stream_title, "");
 
 	if (icy_string == nullptr)
 		return nullptr;