From 84ced5c1af159d537a9d24ecc71e6adc58bf0eff Mon Sep 17 00:00:00 2001 From: John Thompson Date: Fri, 6 Mar 2015 00:39:42 +0000 Subject: Renamed function to avoid confusion about purpose. llvm-svn: 231440 --- clang-tools-extra/modularize/ModularizeUtilities.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'clang-tools-extra/modularize/ModularizeUtilities.cpp') diff --git a/clang-tools-extra/modularize/ModularizeUtilities.cpp b/clang-tools-extra/modularize/ModularizeUtilities.cpp index 50dd8b1f258..c54a6f44b72 100644 --- a/clang-tools-extra/modularize/ModularizeUtilities.cpp +++ b/clang-tools-extra/modularize/ModularizeUtilities.cpp @@ -341,8 +341,10 @@ bool ModularizeUtilities::collectUmbrellaHeaders(StringRef UmbrellaDirName, } return true; } - -std::string normalize(StringRef Path) { + +// Replace .. embedded in path for purposes of having +// a canonical path. +std::string replaceDotDot(StringRef Path) { SmallString<128> Buffer; llvm::sys::path::const_iterator B = llvm::sys::path::begin(Path), E = llvm::sys::path::end(Path); @@ -365,7 +367,7 @@ std::string normalize(StringRef Path) { // \param FilePath The file path, relative to the module map directory. // \returns The file path in canonical form. std::string ModularizeUtilities::getCanonicalPath(StringRef FilePath) { - std::string Tmp(normalize(FilePath)); + std::string Tmp(replaceDotDot(FilePath)); std::replace(Tmp.begin(), Tmp.end(), '\\', '/'); StringRef Tmp2(Tmp); if (Tmp2.startswith("./")) -- cgit v1.2.3