fs/Charset: return std::string from PathFromUTF8()

Don't expose pointer that requires the caller to invoke g_free(),
because that's GLib-only.
This commit is contained in:
Max Kellermann
2014-11-30 00:17:08 +01:00
parent 6987f2ba82
commit 4f80a129f1
4 changed files with 9 additions and 31 deletions

View File

@@ -157,13 +157,13 @@ PathToUTF8(const char *path_fs)
#ifdef HAVE_FS_CHARSET
char *
std::string
PathFromUTF8(const char *path_utf8)
{
assert(path_utf8 != nullptr);
if (fs_charset.empty())
return g_strdup(path_utf8);
return path_utf8;
return g_convert(path_utf8, -1,
fs_charset.c_str(), "utf-8",