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

Path: merge utf8_to_fs_charset() into Path::FromUTF8()

This commit is contained in:
Denis Krjuchkov 2013-01-24 02:35:35 +06:00
parent 3c7cf94643
commit 7149a8ae4f
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fs/Path.cxx
View File

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

12
src/fs/Path.hxx
View File

@ -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.