diff options
| author | Denis Krjuchkov <denis@crazydev.net> | 2013-01-24 02:35:35 +0600 |
|---|---|---|
| committer | Denis Krjuchkov <denis@crazydev.net> | 2013-01-28 00:13:45 +0600 |
| commit | 7149a8ae4f7df43440f71348789585e53aa039d8 (patch) | |
| tree | f44edaac3c16762ed9d2ff2f96c103507b154af7 /src | |
| parent | 3c7cf94643bc45237d1e61c4e6015d498e4400b0 (diff) | |
| download | mpd-7149a8ae4f7df43440f71348789585e53aa039d8.tar.gz mpd-7149a8ae4f7df43440f71348789585e53aa039d8.tar.xz mpd-7149a8ae4f7df43440f71348789585e53aa039d8.zip | |
Path: merge utf8_to_fs_charset() into Path::FromUTF8()
Diffstat (limited to 'src')
| -rw-r--r-- | src/fs/Path.cxx | 5 | ||||
| -rw-r--r-- | src/fs/Path.hxx | 12 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx index 0590fbd8f..6d17cd7da 100644 --- a/src/fs/Path.cxx +++ b/src/fs/Path.cxx @@ -75,8 +75,7 @@ std::string Path::ToUTF8(const_pointer path_fs) return std::string(path_utf8, sizeof(path_utf8) - out_left); } -char * -utf8_to_fs_charset(const char *path_utf8) +Path Path::FromUTF8(const char *path_utf8) { gchar *p; @@ -87,7 +86,7 @@ utf8_to_fs_charset(const char *path_utf8) /* fall back to UTF-8 */ p = g_strdup(path_utf8); - return p; + return Path(Donate(), p); } gcc_pure diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx index 87c3551e9..3d5bd868b 100644 --- a/src/fs/Path.hxx +++ b/src/fs/Path.hxx @@ -48,13 +48,6 @@ void path_global_init(); void path_global_finish(); -/** - * Converts a file name in UTF-8 to the filesystem charset. Returns a - * duplicate of the UTF-8 string on failure. - */ -char * -utf8_to_fs_charset(const char *path_utf8); - const char *path_get_fs_charset(); /** @@ -157,14 +150,13 @@ public: /** * Convert a UTF-8 C string to a #Path instance. + * Returns a duplicate of the UTF-8 string on failure. * * TODO: return a "nulled" instance on error and add checks to * all callers */ gcc_pure - static Path FromUTF8(const char *utf8) { - return Path(Donate(), utf8_to_fs_charset(utf8)); - } + static Path FromUTF8(const char *path_utf8); /** * Convert the path to UTF-8. |