Fixed GUI bug: file test.cpp is loaded from file if scratchpad is empty.

PKEuS · PKEuS · commit b48bf1dbad43 · 2014-10-03T10:40:48.000+02:00
The underlying problem was in lib and is fixed by changing the behaviour of CppCheck::check(). Checking is performed on empty content without attempt to load from file.
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -63,12 +63,14 @@ const char * CppCheck::extraVersion()
 
 unsigned int CppCheck::check(const std::string &path)
 {
-    return processFile(path, "");
+    std::ifstream fin(path.c_str());
+    return processFile(path, fin);
 }
 
 unsigned int CppCheck::check(const std::string &path, const std::string &content)
 {
-    return processFile(path, content);
+    std::istringstream iss(content);
+    return processFile(path, iss);
 }
 
 void CppCheck::replaceAll(std::string& code, const std::string &from, const std::string &to)
@@ -129,7 +131,7 @@ bool CppCheck::findError(std::string code, const char FileName[])
     return true;
 }
 
-unsigned int CppCheck::processFile(const std::string& filename, const std::string& fileContent)
+unsigned int CppCheck::processFile(const std::string& filename, std::istream& fileStream)
 {
     exitcode = 0;
 
@@ -151,15 +153,9 @@ unsigned int CppCheck::processFile(const std::string& filename, const std::strin
         std::list<std::string> configurations;
         std::string filedata = "";
 
-        if (!fileContent.empty()) {
-            // File content was given as a string (democlient)
-            std::istringstream iss(fileContent);
-            preprocessor.preprocess(iss, filedata, configurations, filename, _settings._includePaths);
-        } else {
-            // Only file name was given, read the content from file
-            std::ifstream fin(filename.c_str());
+        {
             Timer t("Preprocessor::preprocess", _settings._showtime, &S_timerResults);
-            preprocessor.preprocess(fin, filedata, configurations, filename, _settings._includePaths);
+            preprocessor.preprocess(fileStream, filedata, configurations, filename, _settings._includePaths);
         }
 
         if (_settings.checkConfiguration) {
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -142,10 +142,10 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     /**
      * @brief Process one file.
      * @param filename file name
-     * @param fileContent If this is non-empty then the file will not be loaded
+     * @param fileStream stream the file content can be read from
      * @return amount of errors found
      */
-    unsigned int processFile(const std::string& filename, const std::string& fileContent);
+    unsigned int processFile(const std::string& filename, std::istream& fileStream);
 
     /** @brief Check file */
     bool checkFile(const std::string &code, const char FileName[], std::set<unsigned long long>& checksums);

Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,14 @@ const char * CppCheck::extraVersion()`
`63`	`63`
`64`	`64`	`unsigned int CppCheck::check(const std::string &path)`
`65`	`65`	`{`
`66`		`- return processFile(path, "");`
	`66`	`+ std::ifstream fin(path.c_str());`
	`67`	`+ return processFile(path, fin);`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`unsigned int CppCheck::check(const std::string &path, const std::string &content)`
`70`	`71`	`{`
`71`		`- return processFile(path, content);`
	`72`	`+ std::istringstream iss(content);`
	`73`	`+ return processFile(path, iss);`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`void CppCheck::replaceAll(std::string& code, const std::string &from, const std::string &to)`
`@@ -129,7 +131,7 @@ bool CppCheck::findError(std::string code, const char FileName[])`
`129`	`131`	`return true;`
`130`	`132`	`}`
`131`	`133`
`132`		`-unsigned int CppCheck::processFile(const std::string& filename, const std::string& fileContent)`
	`134`	`+unsigned int CppCheck::processFile(const std::string& filename, std::istream& fileStream)`
`133`	`135`	`{`
`134`	`136`	`exitcode = 0;`
`135`	`137`
`@@ -151,15 +153,9 @@ unsigned int CppCheck::processFile(const std::string& filename, const std::strin`
`151`	`153`	`std::list<std::string> configurations;`
`152`	`154`	`std::string filedata = "";`
`153`	`155`
`154`		`- if (!fileContent.empty()) {`
`155`		`- // File content was given as a string (democlient)`
`156`		`- std::istringstream iss(fileContent);`
`157`		`- preprocessor.preprocess(iss, filedata, configurations, filename, _settings._includePaths);`
`158`		`- } else {`
`159`		`- // Only file name was given, read the content from file`
`160`		`- std::ifstream fin(filename.c_str());`
	`156`	`+ {`
`161`	`157`	`Timer t("Preprocessor::preprocess", _settings._showtime, &S_timerResults);`
`162`		`- preprocessor.preprocess(fin, filedata, configurations, filename, _settings._includePaths);`
	`158`	`+ preprocessor.preprocess(fileStream, filedata, configurations, filename, _settings._includePaths);`
`163`	`159`	`}`
`164`	`160`
`165`	`161`	`if (_settings.checkConfiguration) {`