oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Mapper: map_fs_to_utf8() returns std::string

Browse Source 
Avoid the conversion to an allocated char*, let the caller decide.
This commit is contained in:
Max Kellermann
2013-10-14 21:43:41 +02:00
parent 8cf2f52f7a
commit 9067da2df8
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/PlaylistFile.cxx
View File

@@ -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())