Tag: move fix_tag_value() to TagString.cxx

1 files changed, 2 insertions, 102 deletions

diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx
index 20711f1cc..d0e44862d 100644
--- a/src/tag/Tag.cxx
+++ b/src/tag/Tag.cxx
@@ -21,6 +21,7 @@
 #include "Tag.hxx"
 #include "TagInternal.hxx"
 #include "TagPool.hxx"
+#include "TagString.hxx"
 
 #include <glib.h>
 #include <assert.h>
@@ -216,48 +217,6 @@ Tag::HasType(tag_type type) const
 	return GetValue(type) != nullptr;
 }
 
-/**
- * Replace invalid sequences with the question mark.
- */
-static char *
-patch_utf8(const char *src, size_t length, const gchar *end)
-{
-	/* duplicate the string, and replace invalid bytes in that
-	   buffer */
-	char *dest = g_strdup(src);
-
-	do {
-		dest[end - src] = '?';
-	} while (!g_utf8_validate(end + 1, (src + length) - (end + 1), &end));
-
-	return dest;
-}
-
-static char *
-fix_utf8(const char *str, size_t length)
-{
-	const gchar *end;
-	char *temp;
-	gsize written;
-
-	assert(str != nullptr);
-
-	/* check if the string is already valid UTF-8 */
-	if (g_utf8_validate(str, length, &end))
-		return nullptr;
-
-	/* no, it's not - try to import it from ISO-Latin-1 */
-	temp = g_convert(str, length, "utf-8", "iso-8859-1",
-			 nullptr, &written, nullptr);
-	if (temp != nullptr)
-		/* success! */
-		return temp;
-
-	/* no, still broken - there's no medication, just patch
-	   invalid sequences */
-	return patch_utf8(str, length, end);
-}
-
 void
 Tag::BeginAdd()
 {
@@ -292,71 +251,12 @@ Tag::EndAdd()
 #endif
 }
 
-static bool
-char_is_non_printable(unsigned char ch)
-{
-	return ch < 0x20;
-}
-
-static const char *
-find_non_printable(const char *p, size_t length)
-{
-	for (size_t i = 0; i < length; ++i)
-		if (char_is_non_printable(p[i]))
-			return p + i;
-
-	return nullptr;
-}
-
-/**
- * Clears all non-printable characters, convert them to space.
- * Returns nullptr if nothing needs to be cleared.
- */
-static char *
-clear_non_printable(const char *p, size_t length)
-{
-	const char *first = find_non_printable(p, length);
-	char *dest;
-
-	if (first == nullptr)
-		return nullptr;
-
-	dest = g_strndup(p, length);
-
-	for (size_t i = first - p; i < length; ++i)
-		if (char_is_non_printable(dest[i]))
-			dest[i] = ' ';
-
-	return dest;
-}
-
-static char *
-fix_tag_value(const char *p, size_t length)
-{
-	char *utf8, *cleared;
-
-	utf8 = fix_utf8(p, length);
-	if (utf8 != nullptr) {
-		p = utf8;
-		length = strlen(p);
-	}
-
-	cleared = clear_non_printable(p, length);
-	if (cleared == nullptr)
-		cleared = utf8;
-	else
-		g_free(utf8);
-
-	return cleared;
-}
-
 void
 Tag::AddItemInternal(tag_type type, const char *value, size_t len)
 {
 	unsigned int i = num_items;
-	char *p;
 
-	p = fix_tag_value(value, len);
+	char *p = FixTagString(value, len);
 	if (p != nullptr) {
 		value = p;
 		len = strlen(value);