Skip to content

M
mpd
Commit 0e00b900 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

fs/Path: pass Path to Relative()

parent a6dd998d
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/Mapper.cxx
View file @ 0e00b900
...@@ -98,7 +98,7 @@ map_fs_to_utf8(Path _path_fs) ...@@ -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();
} }
......
src/fs/AllocatedPath.hxx
View file @ 0e00b900
...@@ -249,8 +249,8 @@ public: ...@@ -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());
} }
/** /**
......
src/fs/Path.hxx
View file @ 0e00b900
...@@ -153,8 +153,8 @@ public: ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment