Refactor CppCheck::_fileContents to a function parameter

danmar · danmar · commit 997c9ce1004d · 2013-08-31T10:28:21.000+02:00
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -62,15 +62,12 @@ const char * CppCheck::extraVersion()
 
 unsigned int CppCheck::check(const std::string &path)
 {
-    return processFile(path);
+    return processFile(path, "");
 }
 
 unsigned int CppCheck::check(const std::string &path, const std::string &content)
 {
-    _fileContent = content;
-    const unsigned int retval = processFile(path);
-    _fileContent.clear();
-    return retval;
+    return processFile(path, content);
 }
 
 void CppCheck::replaceAll(std::string& code, const std::string &from, const std::string &to)
@@ -129,7 +126,7 @@ bool CppCheck::findError(std::string code, const char FileName[])
     return true;
 }
 
-unsigned int CppCheck::processFile(const std::string& filename)
+unsigned int CppCheck::processFile(const std::string& filename, const std::string& fileContent)
 {
     exitcode = 0;
 
@@ -151,9 +148,9 @@ unsigned int CppCheck::processFile(const std::string& filename)
         std::list<std::string> configurations;
         std::string filedata = "";
 
-        if (!_fileContent.empty()) {
-            // File content was given as a string
-            std::istringstream iss(_fileContent);
+        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
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -135,8 +135,13 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     /** @brief There has been a internal error => Report information message */
     void internalError(const std::string &filename, const std::string &msg);
 
-    /** @brief Process one file. */
-    unsigned int processFile(const std::string& filename);
+    /** 
+     * @brief Process one file.
+     * @param filename file name
+     * @param fileContent If this is non-empty then the file will not be loaded
+     * @return amount of errors found
+     */
+    unsigned int processFile(const std::string& filename, const std::string& fileContent);
 
     /** @brief Check file */
     void checkFile(const std::string &code, const char FileName[]);
@@ -179,7 +184,6 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
 
     std::list<std::string> _errorList;
     Settings _settings;
-    std::string _fileContent;
 
     void reportProgress(const std::string &filename, const char stage[], const std::size_t value);
 

Original file line number	Diff line number	Diff line change
`@@ -62,15 +62,12 @@ const char * CppCheck::extraVersion()`
`62`	`62`
`63`	`63`	`unsigned int CppCheck::check(const std::string &path)`
`64`	`64`	`{`
`65`		`- return processFile(path);`
	`65`	`+ return processFile(path, "");`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`unsigned int CppCheck::check(const std::string &path, const std::string &content)`
`69`	`69`	`{`
`70`		`- _fileContent = content;`
`71`		`- const unsigned int retval = processFile(path);`
`72`		`- _fileContent.clear();`
`73`		`- return retval;`
	`70`	`+ return processFile(path, content);`
`74`	`71`	`}`
`75`	`72`
`76`	`73`	`void CppCheck::replaceAll(std::string& code, const std::string &from, const std::string &to)`
`@@ -129,7 +126,7 @@ bool CppCheck::findError(std::string code, const char FileName[])`
`129`	`126`	`return true;`
`130`	`127`	`}`
`131`	`128`
`132`		`-unsigned int CppCheck::processFile(const std::string& filename)`
	`129`	`+unsigned int CppCheck::processFile(const std::string& filename, const std::string& fileContent)`
`133`	`130`	`{`
`134`	`131`	`exitcode = 0;`
`135`	`132`
`@@ -151,9 +148,9 @@ unsigned int CppCheck::processFile(const std::string& filename)`
`151`	`148`	`std::list<std::string> configurations;`
`152`	`149`	`std::string filedata = "";`
`153`	`150`
`154`		`- if (!_fileContent.empty()) {`
`155`		`- // File content was given as a string`
`156`		`- std::istringstream iss(_fileContent);`
	`151`	`+ if (!fileContent.empty()) {`
	`152`	`+ // File content was given as a string (democlient)`
	`153`	`+ std::istringstream iss(fileContent);`
`157`	`154`	`preprocessor.preprocess(iss, filedata, configurations, filename, _settings._includePaths);`
`158`	`155`	`} else {`
`159`	`156`	`// Only file name was given, read the content from file`