From ed7baf3ae12798e1723d575623f1a338f272d529 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 13 Oct 2021 14:31:18 +0200
Subject: [PATCH] tag/Id3Scan: use StringView::Strip() instead of duplicating
 the string

---
 src/tag/Id3Scan.cxx   | 24 +++++-------------------
 src/tag/Id3String.hxx |  4 ----
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/tag/Id3Scan.cxx b/src/tag/Id3Scan.cxx
index 161d29acf..89921f908 100644
--- a/src/tag/Id3Scan.cxx
+++ b/src/tag/Id3Scan.cxx
@@ -25,9 +25,6 @@
 #include "Builder.hxx"
 #include "Tag.hxx"
 #include "Id3MusicBrainz.hxx"
-#include "util/Alloc.hxx"
-#include "util/ScopeExit.hxx"
-#include "util/StringStrip.hxx"
 #include "util/StringView.hxx"
 
 #include <id3tag.h>
@@ -78,31 +75,20 @@ tag_id3_getstring(const struct id3_frame *frame, unsigned i) noexcept
 	return Id3String::FromUCS4(ucs4);
 }
 
-/* This will try to convert a string to utf-8,
- */
-static id3_utf8_t *
-import_id3_string(const id3_ucs4_t *ucs4)
-{
-	auto utf8 = Id3String::FromUCS4(ucs4);
-	if (!utf8)
-		return nullptr;
-
-	return (id3_utf8_t *)xstrdup(Strip(utf8.c_str()));
-}
-
 static void
 InvokeOnTag(TagHandler &handler, TagType type, const id3_ucs4_t *ucs4) noexcept
 {
 	assert(type < TAG_NUM_OF_ITEM_TYPES);
 	assert(ucs4 != nullptr);
 
-	id3_utf8_t *utf8 = import_id3_string(ucs4);
-	if (utf8 == nullptr)
+	const auto utf8 = Id3String::FromUCS4(ucs4);
+	if (!utf8)
 		return;
 
-	AtScopeExit(utf8) { free(utf8); };
+	StringView s{utf8.c_str()};
+	s.Strip();
 
-	handler.OnTag(type, (const char *)utf8);
+	handler.OnTag(type, s);
 }
 
 /**
diff --git a/src/tag/Id3String.hxx b/src/tag/Id3String.hxx
index f0d6e50c2..86d9bcdd0 100644
--- a/src/tag/Id3String.hxx
+++ b/src/tag/Id3String.hxx
@@ -49,10 +49,6 @@ public:
 		return p != nullptr;
 	}
 
-	char *c_str() noexcept {
-		return (char *)p;
-	}
-
 	const char *c_str() const noexcept {
 		return (const char *)p;
 	}