Commit a6dd998d authored by Max Kellermann's avatar Max Kellermann

fs/AllocatedPath: use PathTraitsFS::Relative()

Eliminate duplicate code.
parent cdd0ccc6
......@@ -61,28 +61,6 @@ AllocatedPath::ToUTF8() const
return ::PathToUTF8(c_str());
}
const char *
AllocatedPath::Relative(const char *other_fs) const
{
const size_t l = length();
if (memcmp(data(), other_fs, l) != 0)
return nullptr;
other_fs += l;
if (*other_fs != 0) {
if (!PathTraitsFS::IsSeparator(*other_fs))
/* mismatch */
return nullptr;
/* skip remaining path separators */
do {
++other_fs;
} while (PathTraitsFS::IsSeparator(*other_fs));
}
return other_fs;
}
void
AllocatedPath::ChopSeparators()
{
......
......@@ -249,7 +249,9 @@ public:
* nullptr on mismatch.
*/
gcc_pure
const char *Relative(const char *other_fs) const;
const char *Relative(const char *other_fs) const {
return PathTraitsFS::Relative(c_str(), other_fs);
}
/**
* Chop trailing directory separators.
......
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