diff options
| author | Denis Krjuchkov <denis@crazydev.net> | 2013-01-27 13:26:17 +0600 |
|---|---|---|
| committer | Denis Krjuchkov <denis@crazydev.net> | 2013-01-28 00:13:46 +0600 |
| commit | e98e2a0b07363132707146f571d3411e3e1b8076 (patch) | |
| tree | ce4653efde5670ca2a151e2888114ac9c0423fe4 /src/fs | |
| parent | 943064bb5148884339ccaf60e276191bc4d9abd9 (diff) | |
Path::FromUTF8() returns nulled instance on error, add error handling where required
Diffstat (limited to 'src/fs')
| -rw-r--r-- | src/fs/Path.cxx | 3 | ||||
| -rw-r--r-- | src/fs/Path.hxx | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx index 7664e3ac..cb808b36 100644 --- a/src/fs/Path.cxx +++ b/src/fs/Path.cxx @@ -82,9 +82,6 @@ Path Path::FromUTF8(const char *path_utf8) p = g_convert(path_utf8, -1, fs_charset.c_str(), "utf-8", NULL, NULL, NULL); - if (p == NULL) - /* fall back to UTF-8 */ - p = g_strdup(path_utf8); return Path(Donate(), p); } diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx index b9754b5c..8635d12a 100644 --- a/src/fs/Path.hxx +++ b/src/fs/Path.hxx @@ -144,10 +144,7 @@ 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 + * Returns return a "nulled" instance on error. */ gcc_pure static Path FromUTF8(const char *path_utf8); |