diff --git a/src/Mapper.cxx b/src/Mapper.cxx index 14718ca09..7189544e7 100644 --- a/src/Mapper.cxx +++ b/src/Mapper.cxx @@ -98,7 +98,7 @@ map_fs_to_utf8(Path _path_fs) if (music_dir_fs.IsNull()) return std::string(); - path_fs = music_dir_fs.RelativeFS(path_fs); + path_fs = music_dir_fs.Relative(path_fs); if (path_fs == nullptr || *path_fs == 0) return std::string(); } diff --git a/src/fs/AllocatedPath.cxx b/src/fs/AllocatedPath.cxx index 2d51b6285..51a058ffc 100644 --- a/src/fs/AllocatedPath.cxx +++ b/src/fs/AllocatedPath.cxx @@ -62,7 +62,7 @@ AllocatedPath::ToUTF8() const } const char * -AllocatedPath::RelativeFS(const char *other_fs) const +AllocatedPath::Relative(const char *other_fs) const { const size_t l = length(); if (memcmp(data(), other_fs, l) != 0) diff --git a/src/fs/AllocatedPath.hxx b/src/fs/AllocatedPath.hxx index 1f5733244..4496981d7 100644 --- a/src/fs/AllocatedPath.hxx +++ b/src/fs/AllocatedPath.hxx @@ -249,7 +249,7 @@ public: * nullptr on mismatch. */ gcc_pure - const char *RelativeFS(const char *other_fs) const; + const char *Relative(const char *other_fs) const; /** * Chop trailing directory separators. diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx index bf6d1e3ce..ef663bf0b 100644 --- a/src/fs/Path.hxx +++ b/src/fs/Path.hxx @@ -153,7 +153,7 @@ public: * nullptr on mismatch. */ gcc_pure - const_pointer RelativeFS(const_pointer other_fs) const { + const_pointer Relative(const_pointer other_fs) const { return PathTraitsFS::Relative(value, other_fs); }