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

fs/Charset: change FixSeparators() API to use std::string&&

Browse Source
This commit is contained in:
Max Kellermann 2015-02-08 17:52:01 +00:00
parent afcd5670e3
commit 975e275030
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/fs/Charset.cxx
View File

@ -73,7 +73,8 @@ GetFSCharset()
#endif #endif
} }
static inline void FixSeparators(std::string &s) static inline std::string &&
FixSeparators(std::string &&s)
{ {
#ifdef WIN32 #ifdef WIN32
// For whatever reason GCC can't convert constexpr to value reference. // For whatever reason GCC can't convert constexpr to value reference.
@ -81,9 +82,8 @@ static inline void FixSeparators(std::string &s)
auto from = PathTraitsFS::SEPARATOR; auto from = PathTraitsFS::SEPARATOR;
auto to = PathTraitsUTF8::SEPARATOR; auto to = PathTraitsUTF8::SEPARATOR;
std::replace(s.begin(), s.end(), from, to); std::replace(s.begin(), s.end(), from, to);
#else
(void)s;
#endif #endif
return std::move(s);
} }
std::string std::string
@ -95,17 +95,12 @@ PathToUTF8(const char *path_fs)
#endif #endif
#ifdef HAVE_FS_CHARSET #ifdef HAVE_FS_CHARSET
if (fs_converter == nullptr) { if (fs_converter == nullptr)
#endif #endif
auto result = std::string(path_fs); return FixSeparators(path_fs);
FixSeparators(result);
return result;
#ifdef HAVE_FS_CHARSET #ifdef HAVE_FS_CHARSET
}
auto result_path = fs_converter->ToUTF8(path_fs); return FixSeparators(fs_converter->ToUTF8(path_fs));
FixSeparators(result_path);
return result_path;
#endif #endif
} }