Renamed exitcode to mExitCode

danmar · danmar · commit fe0bd8ff6ceb · 2018-06-17T07:43:25.000+02:00
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -54,7 +54,7 @@ static TimerResults S_timerResults;
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 
 CppCheck::CppCheck(ErrorLogger &errorLogger, bool useGlobalSuppressions)
-    : mErrorLogger(errorLogger), exitcode(0), mUseGlobalSuppressions(useGlobalSuppressions), tooManyConfigs(false), mSimplify(true)
+    : mErrorLogger(errorLogger), mExitCode(0), mUseGlobalSuppressions(useGlobalSuppressions), tooManyConfigs(false), mSimplify(true)
 {
 }
 
@@ -107,14 +107,14 @@ unsigned int CppCheck::check(const ImportProject::FileSettings &fs)
 
 unsigned int CppCheck::checkFile(const std::string& filename, const std::string &cfgname, std::istream& fileStream)
 {
-    exitcode = 0;
+    mExitCode = 0;
 
     // only show debug warnings for accepted C/C++ source files
     if (!Path::acceptFile(filename))
         mSettings.debugwarnings = false;
 
     if (mSettings.terminated())
-        return exitcode;
+        return mExitCode;
 
     if (!mSettings.quiet) {
         std::string fixedpath = Path::simplifyPath(filename);
@@ -250,7 +250,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
                     reportErr(errors.front());
                     errors.pop_front();
                 }
-                return exitcode;  // known results => no need to reanalyze file
+                return mExitCode;  // known results => no need to reanalyze file
             }
         }
 
@@ -482,7 +482,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
         internalError(filename, e.what());
     } catch (const InternalError &e) {
         internalError(filename, e.errorMessage);
-        exitcode=1; // e.g. reflect a syntax error
+        mExitCode=1; // e.g. reflect a syntax error
     }
 
     mAnalyzerInformation.setFileInfo("CheckUnusedFunctions", checkUnusedFunctions.analyzerInfo());
@@ -495,10 +495,10 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
     }
 
     mErrorList.clear();
-    if (internalErrorFound && (exitcode==0)) {
-        exitcode=1;
+    if (internalErrorFound && (mExitCode==0)) {
+        mExitCode = 1;
     }
-    return exitcode;
+    return mExitCode;
 }
 
 void CppCheck::internalError(const std::string &filename, const std::string &msg)
@@ -770,7 +770,7 @@ void CppCheck::reportErr(const ErrorLogger::ErrorMessage &msg)
     }
 
     if (!mSettings.nofail.isSuppressed(errorMessage) && (mUseGlobalSuppressions || !mSettings.nomsg.isSuppressed(errorMessage)))
-        exitcode = 1;
+        mExitCode = 1;
 
     mErrorList.push_back(errmsg);
 
@@ -830,7 +830,7 @@ bool CppCheck::analyseWholeProgram()
     // Analyse the tokens
     for (std::list<Check *>::const_iterator it = Check::instances().begin(); it != Check::instances().end(); ++it)
         errors |= (*it)->analyseWholeProgram(mFileInfo, mSettings, *this);
-    return errors && (exitcode > 0);
+    return errors && (mExitCode > 0);
 }
 
 void CppCheck::analyseWholeProgram(const std::string &buildDir, const std::map<std::string, std::size_t> &files)
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -213,7 +213,7 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     /** @brief Current preprocessor configuration */
     std::string mCurrentConfig;
 
-    unsigned int exitcode;
+    unsigned int mExitCode;
 
     bool mUseGlobalSuppressions;
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ static TimerResults S_timerResults;`
`54`	`54`	`static const CWE CWE398(398U); // Indicator of Poor Code Quality`
`55`	`55`
`56`	`56`	`CppCheck::CppCheck(ErrorLogger &errorLogger, bool useGlobalSuppressions)`
`57`		`- : mErrorLogger(errorLogger), exitcode(0), mUseGlobalSuppressions(useGlobalSuppressions), tooManyConfigs(false), mSimplify(true)`
	`57`	`+ : mErrorLogger(errorLogger), mExitCode(0), mUseGlobalSuppressions(useGlobalSuppressions), tooManyConfigs(false), mSimplify(true)`
`58`	`58`	`{`
`59`	`59`	`}`
`60`	`60`
`@@ -107,14 +107,14 @@ unsigned int CppCheck::check(const ImportProject::FileSettings &fs)`
`107`	`107`
`108`	`108`	`unsigned int CppCheck::checkFile(const std::string& filename, const std::string &cfgname, std::istream& fileStream)`
`109`	`109`	`{`
`110`		`- exitcode = 0;`
	`110`	`+ mExitCode = 0;`
`111`	`111`
`112`	`112`	`// only show debug warnings for accepted C/C++ source files`
`113`	`113`	`if (!Path::acceptFile(filename))`
`114`	`114`	`mSettings.debugwarnings = false;`
`115`	`115`
`116`	`116`	`if (mSettings.terminated())`
`117`		`- return exitcode;`
	`117`	`+ return mExitCode;`
`118`	`118`
`119`	`119`	`if (!mSettings.quiet) {`
`120`	`120`	`std::string fixedpath = Path::simplifyPath(filename);`
`@@ -250,7 +250,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string`
`250`	`250`	`reportErr(errors.front());`
`251`	`251`	`errors.pop_front();`
`252`	`252`	`}`
`253`		`- return exitcode; // known results => no need to reanalyze file`
	`253`	`+ return mExitCode; // known results => no need to reanalyze file`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
`@@ -482,7 +482,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string`
`482`	`482`	`internalError(filename, e.what());`
`483`	`483`	`} catch (const InternalError &e) {`
`484`	`484`	`internalError(filename, e.errorMessage);`
`485`		`- exitcode=1; // e.g. reflect a syntax error`
	`485`	`+ mExitCode=1; // e.g. reflect a syntax error`
`486`	`486`	`}`
`487`	`487`
`488`	`488`	`mAnalyzerInformation.setFileInfo("CheckUnusedFunctions", checkUnusedFunctions.analyzerInfo());`
`@@ -495,10 +495,10 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string`
`495`	`495`	`}`
`496`	`496`
`497`	`497`	`mErrorList.clear();`
`498`		`- if (internalErrorFound && (exitcode==0)) {`
`499`		`- exitcode=1;`
	`498`	`+ if (internalErrorFound && (mExitCode==0)) {`
	`499`	`+ mExitCode = 1;`
`500`	`500`	`}`
`501`		`- return exitcode;`
	`501`	`+ return mExitCode;`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`void CppCheck::internalError(const std::string &filename, const std::string &msg)`
`@@ -770,7 +770,7 @@ void CppCheck::reportErr(const ErrorLogger::ErrorMessage &msg)`
`770`	`770`	`}`
`771`	`771`
`772`	`772`	`if (!mSettings.nofail.isSuppressed(errorMessage) && (mUseGlobalSuppressions \|\| !mSettings.nomsg.isSuppressed(errorMessage)))`
`773`		`- exitcode = 1;`
	`773`	`+ mExitCode = 1;`
`774`	`774`
`775`	`775`	`mErrorList.push_back(errmsg);`
`776`	`776`
`@@ -830,7 +830,7 @@ bool CppCheck::analyseWholeProgram()`
`830`	`830`	`// Analyse the tokens`
`831`	`831`	`for (std::list<Check *>::const_iterator it = Check::instances().begin(); it != Check::instances().end(); ++it)`
`832`	`832`	`errors \|= (it)->analyseWholeProgram(mFileInfo, mSettings, this);`
`833`		`- return errors && (exitcode > 0);`
	`833`	`+ return errors && (mExitCode > 0);`
`834`	`834`	`}`
`835`	`835`
`836`	`836`	`void CppCheck::analyseWholeProgram(const std::string &buildDir, const std::map<std::string, std::size_t> &files)`