removed redundant Path::fromNativeSeparators() calls (cppcheck-opensource#6509)

firewave · web-flow · commit 70b1f665d973 · 2024-06-11T14:14:38.000+02:00
`Path::simplifyPath()` includes the operation
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -897,7 +897,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
             // Write results in file
             else if (std::strncmp(argv[i], "--output-file=", 14) == 0)
-                mSettings.outputFile = Path::simplifyPath(Path::fromNativeSeparators(argv[i] + 14));
+                mSettings.outputFile = Path::simplifyPath(argv[i] + 14);
 
             // Experimental: limit execution time for extended valueflow analysis. basic valueflow analysis
             // is always executed.
@@ -933,7 +933,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
             // Write results in results.plist
             else if (std::strncmp(argv[i], "--plist-output=", 15) == 0) {
-                mSettings.plistOutput = Path::simplifyPath(Path::fromNativeSeparators(argv[i] + 15));
+                mSettings.plistOutput = Path::simplifyPath(argv[i] + 15);
                 if (mSettings.plistOutput.empty())
                     mSettings.plistOutput = ".";
 
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
@@ -53,14 +53,14 @@ void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::
     std::ofstream fout(filesTxt);
     for (const std::string &f : sourcefiles) {
         const std::string afile = getFilename(f);
-        fout << afile << ".a" << (++fileCount[afile]) << "::" << Path::simplifyPath(Path::fromNativeSeparators(f)) << '\n';
+        fout << afile << ".a" << (++fileCount[afile]) << "::" << Path::simplifyPath(f) << '\n';
         if (!userDefines.empty())
-            fout << afile << ".a" << (++fileCount[afile]) << ":" << userDefines << ":" << Path::simplifyPath(Path::fromNativeSeparators(f)) << '\n';
+            fout << afile << ".a" << (++fileCount[afile]) << ":" << userDefines << ":" << Path::simplifyPath(f) << '\n';
     }
 
     for (const FileSettings &fs : fileSettings) {
         const std::string afile = getFilename(fs.filename());
-        fout << afile << ".a" << (++fileCount[afile]) << ":" << fs.cfg << ":" << Path::simplifyPath(Path::fromNativeSeparators(fs.filename())) << std::endl;
+        fout << afile << ".a" << (++fileCount[afile]) << ":" << fs.cfg << ":" << Path::simplifyPath(fs.filename()) << std::endl;
     }
 }
 
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
@@ -731,8 +731,7 @@ std::string ErrorMessage::FileLocation::getOrigFile(bool convert) const
 
 void ErrorMessage::FileLocation::setfile(std::string file)
 {
-    mFileName = Path::fromNativeSeparators(std::move(file));
-    mFileName = Path::simplifyPath(std::move(mFileName));
+    mFileName = Path::simplifyPath(std::move(file));
 }
 
 std::string ErrorMessage::FileLocation::stringify() const
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -138,7 +138,7 @@ static bool simplifyPathWithVariables(std::string &s, std::map<std::string, std:
     }
     if (s.find("$(") != std::string::npos)
         return false;
-    s = Path::simplifyPath(Path::fromNativeSeparators(std::move(s)));
+    s = Path::simplifyPath(std::move(s));
     return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,14 @@ void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::`
`53`	`53`	`std::ofstream fout(filesTxt);`
`54`	`54`	`for (const std::string &f : sourcefiles) {`
`55`	`55`	`const std::string afile = getFilename(f);`
`56`		`- fout << afile << ".a" << (++fileCount[afile]) << "::" << Path::simplifyPath(Path::fromNativeSeparators(f)) << '\n';`
	`56`	`+ fout << afile << ".a" << (++fileCount[afile]) << "::" << Path::simplifyPath(f) << '\n';`
`57`	`57`	`if (!userDefines.empty())`
`58`		`- fout << afile << ".a" << (++fileCount[afile]) << ":" << userDefines << ":" << Path::simplifyPath(Path::fromNativeSeparators(f)) << '\n';`
	`58`	`+ fout << afile << ".a" << (++fileCount[afile]) << ":" << userDefines << ":" << Path::simplifyPath(f) << '\n';`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`for (const FileSettings &fs : fileSettings) {`
`62`	`62`	`const std::string afile = getFilename(fs.filename());`
`63`		`- fout << afile << ".a" << (++fileCount[afile]) << ":" << fs.cfg << ":" << Path::simplifyPath(Path::fromNativeSeparators(fs.filename())) << std::endl;`
	`63`	`+ fout << afile << ".a" << (++fileCount[afile]) << ":" << fs.cfg << ":" << Path::simplifyPath(fs.filename()) << std::endl;`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -731,8 +731,7 @@ std::string ErrorMessage::FileLocation::getOrigFile(bool convert) const`
`731`	`731`
`732`	`732`	`void ErrorMessage::FileLocation::setfile(std::string file)`
`733`	`733`	`{`
`734`		`- mFileName = Path::fromNativeSeparators(std::move(file));`
`735`		`- mFileName = Path::simplifyPath(std::move(mFileName));`
	`734`	`+ mFileName = Path::simplifyPath(std::move(file));`
`736`	`735`	`}`
`737`	`736`
`738`	`737`	`std::string ErrorMessage::FileLocation::stringify() const`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ static bool simplifyPathWithVariables(std::string &s, std::map<std::string, std:`
`138`	`138`	`}`
`139`	`139`	`if (s.find("$(") != std::string::npos)`
`140`	`140`	`return false;`
`141`		`- s = Path::simplifyPath(Path::fromNativeSeparators(std::move(s)));`
	`141`	`+ s = Path::simplifyPath(std::move(s));`
`142`	`142`	`return true;`
`143`	`143`	`}`
`144`	`144`