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

Renamed _useGlobalSuppressions

This commit is contained in:
Daniel Marjamäki 2018-06-17 07:29:07 +02:00
parent b992b4a4f0
commit 54ba0e58c1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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), _useGlobalSuppressions(useGlobalSuppressions), tooManyConfigs(false), _simplify(true) : mErrorLogger(errorLogger), exitcode(0), mUseGlobalSuppressions(useGlobalSuppressions), tooManyConfigs(false), _simplify(true)
{ {
} }
@ -91,7 +91,7 @@ unsigned int CppCheck::check(const std::string &path, const std::string &content
unsigned int CppCheck::check(const ImportProject::FileSettings &fs) unsigned int CppCheck::check(const ImportProject::FileSettings &fs)
{ {
CppCheck temp(mErrorLogger, _useGlobalSuppressions); CppCheck temp(mErrorLogger, mUseGlobalSuppressions);
temp.mSettings = mSettings; temp.mSettings = mSettings;
if (!temp.mSettings.userDefines.empty()) if (!temp.mSettings.userDefines.empty())
temp.mSettings.userDefines += ';'; temp.mSettings.userDefines += ';';
@ -761,7 +761,7 @@ void CppCheck::reportErr(const ErrorLogger::ErrorMessage &msg)
const Suppressions::ErrorMessage errorMessage = msg.toSuppressionsErrorMessage(); const Suppressions::ErrorMessage errorMessage = msg.toSuppressionsErrorMessage();
if (_useGlobalSuppressions) { if (mUseGlobalSuppressions) {
if (mSettings.nomsg.isSuppressed(errorMessage)) if (mSettings.nomsg.isSuppressed(errorMessage))
return; return;
} else { } else {
@ -769,7 +769,7 @@ void CppCheck::reportErr(const ErrorLogger::ErrorMessage &msg)
return; return;
} }
if (!mSettings.nofail.isSuppressed(errorMessage) && (_useGlobalSuppressions || !mSettings.nomsg.isSuppressed(errorMessage))) if (!mSettings.nofail.isSuppressed(errorMessage) && (mUseGlobalSuppressions || !mSettings.nomsg.isSuppressed(errorMessage)))
exitcode = 1; exitcode = 1;
mErrorList.push_back(errmsg); mErrorList.push_back(errmsg);

2
lib/cppcheck.h
View File

@ -215,7 +215,7 @@ private:
unsigned int exitcode; unsigned int exitcode;
bool _useGlobalSuppressions; bool mUseGlobalSuppressions;
/** Are there too many configs? */ /** Are there too many configs? */
bool tooManyConfigs; bool tooManyConfigs;