walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Renamed exitcode to mExitCode

This commit is contained in:
Daniel Marjamäki 2018-06-17 07:43:25 +02:00
parent 6ff6f0ae45
commit fe0bd8ff6c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/cppcheck.cpp
View File

@ -54,7 +54,7 @@ static TimerResults S_timerResults;
static const CWE CWE398(398U); // Indicator of Poor Code Quality static const CWE CWE398(398U); // Indicator of Poor Code Quality
CppCheck::CppCheck(ErrorLogger &errorLogger, bool useGlobalSuppressions) 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) 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 // only show debug warnings for accepted C/C++ source files
if (!Path::acceptFile(filename)) if (!Path::acceptFile(filename))
mSettings.debugwarnings = false; mSettings.debugwarnings = false;
if (mSettings.terminated()) if (mSettings.terminated())
return exitcode; return mExitCode;
if (!mSettings.quiet) { if (!mSettings.quiet) {
std::string fixedpath = Path::simplifyPath(filename); std::string fixedpath = Path::simplifyPath(filename);
@ -250,7 +250,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
reportErr(errors.front()); reportErr(errors.front());
errors.pop_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()); internalError(filename, e.what());
} catch (const InternalError &e) { } catch (const InternalError &e) {
internalError(filename, e.errorMessage); 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()); mAnalyzerInformation.setFileInfo("CheckUnusedFunctions", checkUnusedFunctions.analyzerInfo());
@ -495,10 +495,10 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
} }
mErrorList.clear(); mErrorList.clear();
if (internalErrorFound && (exitcode==0)) { if (internalErrorFound && (mExitCode==0)) {
exitcode=1; mExitCode = 1;
} }
return exitcode; return mExitCode;
} }
void CppCheck::internalError(const std::string &filename, const std::string &msg) 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))) if (!mSettings.nofail.isSuppressed(errorMessage) && (mUseGlobalSuppressions || !mSettings.nomsg.isSuppressed(errorMessage)))
exitcode = 1; mExitCode = 1;
mErrorList.push_back(errmsg); mErrorList.push_back(errmsg);
@ -830,7 +830,7 @@ bool CppCheck::analyseWholeProgram()
// Analyse the tokens // Analyse the tokens
for (std::list<Check *>::const_iterator it = Check::instances().begin(); it != Check::instances().end(); ++it) for (std::list<Check *>::const_iterator it = Check::instances().begin(); it != Check::instances().end(); ++it)
errors |= (*it)->analyseWholeProgram(mFileInfo, mSettings, *this); 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) void CppCheck::analyseWholeProgram(const std::string &buildDir, const std::map<std::string, std::size_t> &files)

2
lib/cppcheck.h
View File

@ -213,7 +213,7 @@ private:
/** @brief Current preprocessor configuration */ /** @brief Current preprocessor configuration */
std::string mCurrentConfig; std::string mCurrentConfig;
unsigned int exitcode; unsigned int mExitCode;
bool mUseGlobalSuppressions; bool mUseGlobalSuppressions;