Skip to content

converted CppCheck::mCurrentConfig to a local variable #7501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 1 commit into from
May 5, 2025
Merged

converted CppCheck::mCurrentConfig to a local variable #7501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions lib/cppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,22 +1092,24 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
if (!mSettings.force && ++checkCount > mSettings.maxConfigs)
break;

std::string currentConfig;

if (!mSettings.userDefines.empty()) {
mCurrentConfig = mSettings.userDefines;
currentConfig = mSettings.userDefines;
const std::vector<std::string> v1(split(mSettings.userDefines, ";"));
for (const std::string &cfg: split(currCfg, ";")) {
if (std::find(v1.cbegin(), v1.cend(), cfg) == v1.cend()) {
mCurrentConfig += ";" + cfg;
currentConfig += ";" + cfg;
}
}
} else {
mCurrentConfig = currCfg;
currentConfig = currCfg;
}

if (mSettings.preprocessOnly) {
std::string codeWithoutCfg;
Timer::run("Preprocessor::getcode", mSettings.showtime, &s_timerResults, [&]() {
codeWithoutCfg = preprocessor.getcode(tokens1, mCurrentConfig, files, true);
codeWithoutCfg = preprocessor.getcode(tokens1, currentConfig, files, true);
});

if (startsWith(codeWithoutCfg,"#file"))
Expand All @@ -1130,7 +1132,7 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string

// Create tokens, skip rest of iteration if failed
Timer::run("Tokenizer::createTokens", mSettings.showtime, &s_timerResults, [&]() {
simplecpp::TokenList tokensP = preprocessor.preprocess(tokens1, mCurrentConfig, files, true);
simplecpp::TokenList tokensP = preprocessor.preprocess(tokens1, currentConfig, files, true);
tokenlist.createTokens(std::move(tokensP));
});
hasValidConfig = true;
Expand All @@ -1145,9 +1147,9 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
mLogger->setLocationMacros(tokenizer.tokens(), files);

// If only errors are printed, print filename after the check
if (!mSettings.quiet && (!mCurrentConfig.empty() || checkCount > 1)) {
if (!mSettings.quiet && (!currentConfig.empty() || checkCount > 1)) {
std::string fixedpath = Path::toNativeSeparators(file.spath());
mErrorLogger.reportOut("Checking " + fixedpath + ": " + mCurrentConfig + "...", Color::FgGreen);
mErrorLogger.reportOut("Checking " + fixedpath + ": " + currentConfig + "...", Color::FgGreen);
}

if (!tokenizer.tokens())
Expand All @@ -1163,12 +1165,12 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
#endif

// Simplify tokens into normal form, skip rest of iteration if failed
if (!tokenizer.simplifyTokens1(mCurrentConfig))
if (!tokenizer.simplifyTokens1(currentConfig))
continue;

// dump xml if --dump
if ((mSettings.dump || !mSettings.addons.empty()) && fdump.is_open()) {
fdump << "<dump cfg=\"" << ErrorLogger::toxml(mCurrentConfig) << "\">" << std::endl;
fdump << "<dump cfg=\"" << ErrorLogger::toxml(currentConfig) << "\">" << std::endl;
fdump << " <standards>" << std::endl;
fdump << " <c version=\"" << mSettings.standards.getC() << "\"/>" << std::endl;
fdump << " <cpp version=\"" << mSettings.standards.getCPP() << "\"/>" << std::endl;
Expand All @@ -1189,7 +1191,7 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
const std::size_t hash = tokenizer.list.calculateHash();
if (hashes.find(hash) != hashes.end()) {
if (mSettings.debugwarnings)
purgedConfigurationMessage(file.spath(), mCurrentConfig);
purgedConfigurationMessage(file.spath(), currentConfig);
continue;
}
hashes.insert(hash);
Expand All @@ -1203,7 +1205,7 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
}
} catch (const simplecpp::Output &o) {
// #error etc during preprocessing
configurationError.push_back((mCurrentConfig.empty() ? "\'\'" : mCurrentConfig) + " : [" + o.location.file() + ':' + std::to_string(o.location.line) + "] " + o.msg);
configurationError.push_back((currentConfig.empty() ? "\'\'" : currentConfig) + " : [" + o.location.file() + ':' + std::to_string(o.location.line) + "] " + o.msg);
--checkCount; // don't count invalid configurations

if (!hasValidConfig && currCfg == *configurations.rbegin()) {
Expand Down
3 changes: 0 additions & 3 deletions lib/cppcheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,6 @@ class CPPCHECKLIB CppCheck {
/** the ErrorLogger provided to this instance */
ErrorLogger& mErrorLoggerDirect;

/** @brief Current preprocessor configuration */
std::string mCurrentConfig;

bool mUseGlobalSuppressions;

/** Are there too many configs? */
Expand Down
Loading