From 4f80a129f13daae72e0463923250534e0d437026 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 30 Nov 2014 00:17:08 +0100 Subject: fs/Charset: return std::string from PathFromUTF8() Don't expose pointer that requires the caller to invoke g_free(), because that's GLib-only. --- src/fs/Charset.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fs/Charset.cxx') diff --git a/src/fs/Charset.cxx b/src/fs/Charset.cxx index c98170c24..fb7313a35 100644 --- a/src/fs/Charset.cxx +++ b/src/fs/Charset.cxx @@ -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", -- cgit v1.2.3