Refactorization: avoid string copying in Path::getPathFromFilename()

PKEuS · PKEuS · commit 5bc775e43ee8 · 2014-10-30T23:48:23.000+01:00
diff --git a/cli/cppcheckexecutor.h b/cli/cppcheckexecutor.h
@@ -140,6 +140,7 @@ class CppCheckExecutor : public ErrorLogger {
     *         If no errors are found, 0 is returned.
     */
     int check_internal(CppCheck& cppcheck, int argc, const char* const argv[]);
+
     /**
      * Pointer to current settings; set while check() is running.
      */
diff --git a/lib/path.cpp b/lib/path.cpp
@@ -109,14 +109,12 @@ std::string Path::simplifyPath(std::string originalPath)
 
 std::string Path::getPathFromFilename(const std::string &filename)
 {
-    std::string path = "";
-
     std::size_t pos = filename.find_last_of("\\/");
 
     if (pos != std::string::npos)
-        path = filename.substr(0, 1 + pos);
+        return filename.substr(0, 1 + pos);
 
-    return path;
+    return "";
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -109,14 +109,12 @@ std::string Path::simplifyPath(std::string originalPath)`
`109`	`109`
`110`	`110`	`std::string Path::getPathFromFilename(const std::string &filename)`
`111`	`111`	`{`
`112`		`- std::string path = "";`
`113`		`-`
`114`	`112`	`std::size_t pos = filename.find_last_of("\\/");`
`115`	`113`
`116`	`114`	`if (pos != std::string::npos)`
`117`		`- path = filename.substr(0, 1 + pos);`
	`115`	`+ return filename.substr(0, 1 + pos);`
`118`	`116`
`119`		`- return path;`
	`117`	`+ return "";`
`120`	`118`	`}`
`121`	`119`
`122`	`120`