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

cppcheck.cpp: only call `getFileInfo()` if necessary (#4510)

This commit is contained in:
Oliver Stöneberg 2022-09-27 20:04:35 +02:00 committed by GitHub
parent b9e07e918e
commit 10426f6707
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/cppcheck.cpp
View File

@ -971,8 +971,10 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
mExitCode=1; // e.g. reflect a syntax error
}
mAnalyzerInformation.setFileInfo("CheckUnusedFunctions", checkUnusedFunctions.analyzerInfo());
mAnalyzerInformation.close();
if (!mSettings.buildDir.empty()) {
mAnalyzerInformation.setFileInfo("CheckUnusedFunctions", checkUnusedFunctions.analyzerInfo());
mAnalyzerInformation.close();
}
// In jointSuppressionReport mode, unmatched suppressions are
// collected after all files are processed
@ -1039,19 +1041,26 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
// TODO: Use CTU for Clang analysis
return;
// Analyse the tokens..
CTU::FileInfo *fi1 = CTU::getFileInfo(&tokenizer);
if (fi1) {
mFileInfo.push_back(fi1);
mAnalyzerInformation.setFileInfo("ctu", fi1->toString());
}
if (mSettings.jobs == 1 || !mSettings.buildDir.empty()) {
// Analyse the tokens..
for (const Check *check : Check::instances()) {
Check::FileInfo *fi = check->getFileInfo(&tokenizer, &mSettings);
if (fi != nullptr) {
mFileInfo.push_back(fi);
mAnalyzerInformation.setFileInfo(check->name(), fi->toString());
CTU::FileInfo *fi1 = CTU::getFileInfo(&tokenizer);
if (fi1) {
if (mSettings.jobs == 1)
mFileInfo.push_back(fi1);
if (!mSettings.buildDir.empty())
mAnalyzerInformation.setFileInfo("ctu", fi1->toString());
}
for (const Check *check: Check::instances()) {
Check::FileInfo *fi = check->getFileInfo(&tokenizer, &mSettings);
if (fi != nullptr) {
if (mSettings.jobs == 1)
mFileInfo.push_back(fi);
if (!mSettings.buildDir.empty())
mAnalyzerInformation.setFileInfo(check->name(), fi->toString());
}
}
}
@ -1535,7 +1544,8 @@ void CppCheck::reportErr(const ErrorMessage &msg)
if (std::find(mErrorList.begin(), mErrorList.end(), errmsg) != mErrorList.end())
return;
mAnalyzerInformation.reportErr(msg, mSettings.verbose);
if (!mSettings.buildDir.empty())
mAnalyzerInformation.reportErr(msg, mSettings.verbose);
const Suppressions::ErrorMessage errorMessage = msg.toSuppressionsErrorMessage();