aboutsummaryrefslogtreecommitdiffstats
path: root/src/fs/Path.hxx
diff options
context:
space:
mode:
authorDenis Krjuchkov <denis@crazydev.net>2013-01-24 02:35:35 +0600
committerDenis Krjuchkov <denis@crazydev.net>2013-01-28 00:13:45 +0600
commit7149a8ae4f7df43440f71348789585e53aa039d8 (patch)
treef44edaac3c16762ed9d2ff2f96c103507b154af7 /src/fs/Path.hxx
parent3c7cf94643bc45237d1e61c4e6015d498e4400b0 (diff)
downloadmpd-7149a8ae4f7df43440f71348789585e53aa039d8.tar.gz
mpd-7149a8ae4f7df43440f71348789585e53aa039d8.tar.xz
mpd-7149a8ae4f7df43440f71348789585e53aa039d8.zip
Path: merge utf8_to_fs_charset() into Path::FromUTF8()
Diffstat (limited to 'src/fs/Path.hxx')
-rw-r--r--src/fs/Path.hxx12
1 files changed, 2 insertions, 10 deletions
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.