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

fs/Path: pass Path to Relative()

Browse Source
This commit is contained in:
Max Kellermann 2015-02-28 23:45:16 +01:00
parent a6dd998d31
commit 0e00b9009d
3 changed files with 5 additions and 5 deletions

2
src/Mapper.cxx

@ -98,7 +98,7 @@ map_fs_to_utf8(Path _path_fs)
if (music_dir_fs.IsNull()) if (music_dir_fs.IsNull())
return std::string(); return std::string();
path_fs = music_dir_fs.Relative(path_fs); path_fs = music_dir_fs.Relative(_path_fs);
if (path_fs == nullptr || *path_fs == 0) if (path_fs == nullptr || *path_fs == 0)
return std::string(); return std::string();
} }

4
src/fs/AllocatedPath.hxx

@ -249,8 +249,8 @@ public:
* nullptr on mismatch. * nullptr on mismatch.
*/ */
gcc_pure gcc_pure
const char *Relative(const char *other_fs) const { const_pointer Relative(Path other_fs) const {
return PathTraitsFS::Relative(c_str(), other_fs); return PathTraitsFS::Relative(c_str(), other_fs.c_str());
} }
/** /**

4
src/fs/Path.hxx

@ -153,8 +153,8 @@ public:
* nullptr on mismatch. * nullptr on mismatch.
*/ */
gcc_pure gcc_pure
const_pointer Relative(const_pointer other_fs) const { const_pointer Relative(Path other_fs) const {
return PathTraitsFS::Relative(value, other_fs); return PathTraitsFS::Relative(c_str(), other_fs.c_str());
} }
gcc_pure gcc_pure