From 9067da2df8472d6c5871f075654dc0561fbb13f3 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 14 Oct 2013 21:43:41 +0200
Subject: Mapper: map_fs_to_utf8() returns std::string

Avoid the conversion to an allocated char*, let the caller decide.
---
 src/PlaylistFile.cxx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/PlaylistFile.cxx')

diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index e01bc1d26..b7ed10dfa 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -248,13 +248,11 @@ LoadPlaylistFile(const char *utf8path, Error &error)
 
 			s = g_strconcat("file://", path.c_str(), NULL);
 		} else if (!uri_has_scheme(s)) {
-			char *path_utf8;
-
-			path_utf8 = map_fs_to_utf8(s);
-			if (path_utf8 == nullptr)
+			const auto path = map_fs_to_utf8(s);
+			if (path.empty())
 				continue;
 
-			s = path_utf8;
+			s = g_strdup(path.c_str());
 		} else {
 			const auto path = Path::ToUTF8(s);
 			if (path.empty())
-- 
cgit v1.2.3