Simplify some statements

mathbunnyru · mathbunnyru · commit 132c0af22af0 · 2017-06-01T02:02:12.000+03:00
diff --git a/cli/filelister.cpp b/cli/filelister.cpp
@@ -231,19 +231,13 @@ void FileLister::addFiles(std::map<std::string, std::size_t> &files, const std::
 bool FileLister::isDirectory(const std::string &path)
 {
     struct stat file_stat;
-    if (stat(path.c_str(), &file_stat) != -1)
-        return ((file_stat.st_mode & S_IFMT) == S_IFDIR);
-
-    return false;
+    return (stat(path.c_str(), &file_stat) != -1 && (file_stat.st_mode & S_IFMT) == S_IFDIR);
 }
 
 bool FileLister::fileExists(const std::string &path)
 {
     struct stat file_stat;
-    if (stat(path.c_str(), &file_stat) != -1)
-        return ((file_stat.st_mode & S_IFMT) == S_IFREG);
-
-    return false;
+    return (stat(path.c_str(), &file_stat) != -1 && (file_stat.st_mode & S_IFMT) == S_IFREG);
 }
 
 #endif
diff --git a/gui/test/data/benchmark/simple.cpp b/gui/test/data/benchmark/simple.cpp
@@ -1064,7 +1064,7 @@ class Variables {
 
         /** is variable unused? */
         bool unused() const {
-            return (_read == false && _write == false);
+            return (!_read && !_write);
         }
 
         const Token *_name;
diff --git a/lib/path.cpp b/lib/path.cpp
@@ -251,20 +251,17 @@ bool Path::isC(const std::string &path)
 bool Path::isCPP(const std::string &path)
 {
     const std::string extension = getFilenameExtensionInLowerCase(path);
-    if (extension == ".cpp" ||
+    return extension == ".cpp" ||
         extension == ".cxx" ||
         extension == ".cc" ||
         extension == ".c++" ||
         extension == ".hpp" ||
         extension == ".hxx" ||
         extension == ".hh" ||
         extension == ".tpp" ||
-        extension == ".txx") {
-        return true;
-    }
-
+        extension == ".txx" ||
+        getFilenameExtension(path) == ".C";
     // In unix, ".C" is considered C++ file
-    return (getFilenameExtension(path) == ".C");
 }
 
 bool Path::acceptFile(const std::string &path, const std::set<std::string> &extra)

Original file line number	Diff line number	Diff line change
`@@ -231,19 +231,13 @@ void FileLister::addFiles(std::map<std::string, std::size_t> &files, const std::`
`231`	`231`	`bool FileLister::isDirectory(const std::string &path)`
`232`	`232`	`{`
`233`	`233`	`struct stat file_stat;`
`234`		`- if (stat(path.c_str(), &file_stat) != -1)`
`235`		`- return ((file_stat.st_mode & S_IFMT) == S_IFDIR);`
`236`		`-`
`237`		`- return false;`
	`234`	`+ return (stat(path.c_str(), &file_stat) != -1 && (file_stat.st_mode & S_IFMT) == S_IFDIR);`
`238`	`235`	`}`
`239`	`236`
`240`	`237`	`bool FileLister::fileExists(const std::string &path)`
`241`	`238`	`{`
`242`	`239`	`struct stat file_stat;`
`243`		`- if (stat(path.c_str(), &file_stat) != -1)`
`244`		`- return ((file_stat.st_mode & S_IFMT) == S_IFREG);`
`245`		`-`
`246`		`- return false;`
	`240`	`+ return (stat(path.c_str(), &file_stat) != -1 && (file_stat.st_mode & S_IFMT) == S_IFREG);`
`247`	`241`	`}`
`248`	`242`
`249`	`243`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1064,7 +1064,7 @@ class Variables {`
`1064`	`1064`
`1065`	`1065`	`/** is variable unused? */`
`1066`	`1066`	`bool unused() const {`
`1067`		`- return (_read == false && _write == false);`
	`1067`	`+ return (!_read && !_write);`
`1068`	`1068`	`}`
`1069`	`1069`
`1070`	`1070`	`const Token *_name;`