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

Renamed cfg to mCurrentConfig

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

28
lib/cppcheck.cpp
View File

@ -61,8 +61,8 @@ CppCheck::CppCheck(ErrorLogger &errorLogger, bool useGlobalSuppressions)
CppCheck::~CppCheck() CppCheck::~CppCheck()
{ {
while (!mFileInfo.empty()) { while (!mFileInfo.empty()) {
delete fileInfo.back(); delete mFileInfo.back();
fileInfo.pop_back(); mFileInfo.pop_back();
} }
S_timerResults.ShowResults(mSettings.showtime); S_timerResults.ShowResults(mSettings.showtime);
} }
@ -315,17 +315,17 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
if (!mSettings.force && ++checkCount > mSettings.maxConfigs) if (!mSettings.force && ++checkCount > mSettings.maxConfigs)
break; break;
cfg = *it; mCurrentConfig = *it;
if (!mSettings.userDefines.empty()) { if (!mSettings.userDefines.empty()) {
if (!cfg.empty()) if (!mCurrentConfig.empty())
cfg = ";" + cfg; mCurrentConfig = ";" + mCurrentConfig;
cfg = mSettings.userDefines + cfg; mCurrentConfig = mSettings.userDefines + mCurrentConfig;
} }
if (mSettings.preprocessOnly) { if (mSettings.preprocessOnly) {
Timer t("Preprocessor::getcode", mSettings.showtime, &S_timerResults); Timer t("Preprocessor::getcode", mSettings.showtime, &S_timerResults);
std::string codeWithoutCfg = preprocessor.getcode(tokens1, cfg, files, true); std::string codeWithoutCfg = preprocessor.getcode(tokens1, mCurrentConfig, files, true);
t.Stop(); t.Stop();
if (codeWithoutCfg.compare(0,5,"#file") == 0) if (codeWithoutCfg.compare(0,5,"#file") == 0)
@ -352,16 +352,16 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
// Create tokens, skip rest of iteration if failed // Create tokens, skip rest of iteration if failed
Timer timer("Tokenizer::createTokens", mSettings.showtime, &S_timerResults); Timer timer("Tokenizer::createTokens", mSettings.showtime, &S_timerResults);
const simplecpp::TokenList &tokensP = preprocessor.preprocess(tokens1, cfg, files, true); const simplecpp::TokenList &tokensP = preprocessor.preprocess(tokens1, mCurrentConfig, files, true);
mTokenizer.createTokens(&tokensP); mTokenizer.createTokens(&tokensP);
timer.Stop(); timer.Stop();
hasValidConfig = true; hasValidConfig = true;
// If only errors are printed, print filename after the check // If only errors are printed, print filename after the check
if (!mSettings.quiet && (!cfg.empty() || it != configurations.begin())) { if (!mSettings.quiet && (!mCurrentConfig.empty() || it != configurations.begin())) {
std::string fixedpath = Path::simplifyPath(filename); std::string fixedpath = Path::simplifyPath(filename);
fixedpath = Path::toNativeSeparators(fixedpath); fixedpath = Path::toNativeSeparators(fixedpath);
mErrorLogger.reportOut("Checking " + fixedpath + ": " + cfg + "..."); mErrorLogger.reportOut("Checking " + fixedpath + ": " + mCurrentConfig + "...");
} }
if (tokensP.empty()) if (tokensP.empty())
@ -376,14 +376,14 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
// Simplify tokens into normal form, skip rest of iteration if failed // Simplify tokens into normal form, skip rest of iteration if failed
Timer timer2("Tokenizer::simplifyTokens1", mSettings.showtime, &S_timerResults); Timer timer2("Tokenizer::simplifyTokens1", mSettings.showtime, &S_timerResults);
result = mTokenizer.simplifyTokens1(cfg); result = mTokenizer.simplifyTokens1(mCurrentConfig);
timer2.Stop(); timer2.Stop();
if (!result) if (!result)
continue; continue;
// dump xml if --dump // dump xml if --dump
if (mSettings.dump && fdump.is_open()) { if (mSettings.dump && fdump.is_open()) {
fdump << "<dump cfg=\"" << ErrorLogger::toxml(cfg) << "\">" << std::endl; fdump << "<dump cfg=\"" << ErrorLogger::toxml(mCurrentConfig) << "\">" << std::endl;
preprocessor.dump(fdump); preprocessor.dump(fdump);
mTokenizer.dump(fdump); mTokenizer.dump(fdump);
fdump << "</dump>" << std::endl; fdump << "</dump>" << std::endl;
@ -394,7 +394,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
const unsigned long long checksum = mTokenizer.list.calculateChecksum(); const unsigned long long checksum = mTokenizer.list.calculateChecksum();
if (checksums.find(checksum) != checksums.end()) { if (checksums.find(checksum) != checksums.end()) {
if (mSettings.isEnabled(Settings::INFORMATION) && (mSettings.debug || mSettings.verbose)) if (mSettings.isEnabled(Settings::INFORMATION) && (mSettings.debug || mSettings.verbose))
purgedConfigurationMessage(filename, cfg); purgedConfigurationMessage(filename, mCurrentConfig);
continue; continue;
} }
checksums.insert(checksum); checksums.insert(checksum);
@ -422,7 +422,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
} catch (const simplecpp::Output &o) { } catch (const simplecpp::Output &o) {
// #error etc during preprocessing // #error etc during preprocessing
configurationError.push_back((cfg.empty() ? "\'\'" : cfg) + " : [" + o.location.file() + ':' + MathLib::toString(o.location.line) + "] " + o.msg); configurationError.push_back((mCurrentConfig.empty() ? "\'\'" : mCurrentConfig) + " : [" + o.location.file() + ':' + MathLib::toString(o.location.line) + "] " + o.msg);
--checkCount; // don't count invalid configurations --checkCount; // don't count invalid configurations
continue; continue;

2
lib/cppcheck.h
View File

@ -211,7 +211,7 @@ private:
ErrorLogger &mErrorLogger; ErrorLogger &mErrorLogger;
/** @brief Current preprocessor configuration */ /** @brief Current preprocessor configuration */
std::string cfg; std::string mCurrentConfig;
unsigned int exitcode; unsigned int exitcode;