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

fs/AllocatedPath: add Android-only FromUTF8(std::string&&) overload

Browse Source
This commit is contained in:
Max Kellermann 2019-04-24 14:39:47 +02:00
parent 7a98a784b2
commit 1415bac1d6
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fs/AllocatedPath.hxx
View File

@ -157,6 +157,19 @@ public:
return AllocatedPath(std::move(fs)); return AllocatedPath(std::move(fs));
} }
#ifdef ANDROID
gcc_pure
static AllocatedPath FromUTF8(std::string &&utf8) noexcept {
/* on Android, the filesystem charset is hard-coded to
UTF-8 */
/* note: we should be using FS_CHARSET_ALWAYS_UTF8
here, but that would require adding a dependency on
header Features.hxx which I'd like to avoid for
now */
return FromFS(std::move(utf8));
}
#endif
/** /**
* Convert a UTF-8 C string to an #AllocatedPath instance. * Convert a UTF-8 C string to an #AllocatedPath instance.
* Returns return a "nulled" instance on error. * Returns return a "nulled" instance on error.