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

Updated output when Cppcheck fails to find valid configurations

This commit is contained in:
Daniel Marjamäki 2018-05-17 10:27:05 +02:00
parent 7062df5d78
commit 2b14b71c93
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/cppcheck.cpp
View File

@ -317,13 +317,6 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
cfg = *it; cfg = *it;
// If only errors are printed, print filename after the check
if (!_settings.quiet && (!cfg.empty() || it != configurations.begin())) {
std::string fixedpath = Path::simplifyPath(filename);
fixedpath = Path::toNativeSeparators(fixedpath);
_errorLogger.reportOut("Checking " + fixedpath + ": " + cfg + "...");
}
if (!_settings.userDefines.empty()) { if (!_settings.userDefines.empty()) {
if (!cfg.empty()) if (!cfg.empty())
cfg = ";" + cfg; cfg = ";" + cfg;
@ -363,6 +356,14 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
_tokenizer.createTokens(&tokensP); _tokenizer.createTokens(&tokensP);
timer.Stop(); timer.Stop();
hasValidConfig = true; hasValidConfig = true;
// If only errors are printed, print filename after the check
if (!_settings.quiet && (!cfg.empty() || it != configurations.begin())) {
std::string fixedpath = Path::simplifyPath(filename);
fixedpath = Path::toNativeSeparators(fixedpath);
_errorLogger.reportOut("Checking " + fixedpath + ": " + cfg + "...");
}
if (tokensP.empty()) if (tokensP.empty())
continue; continue;
@ -421,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(std::string(o.location.file() + ':' + MathLib::toString(o.location.line) + ": " + o.msg)); configurationError.push_back((cfg.empty() ? "\'\'" : cfg) + " : [" + o.location.file() + ':' + MathLib::toString(o.location.line) + "] " + o.msg);
--checkCount; // don't count invalid configurations --checkCount; // don't count invalid configurations
continue; continue;
@ -453,10 +454,10 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
if (!hasValidConfig && configurations.size() > 1 && _settings.isEnabled(Settings::INFORMATION)) { if (!hasValidConfig && configurations.size() > 1 && _settings.isEnabled(Settings::INFORMATION)) {
std::string msg; std::string msg;
msg = "This file is not analyzed. Every tested configuration results in preprocessor errors. It seems that Cppcheck failed to extract a valid configuration. Use -v for more details."; msg = "This file is not analyzed. Cppcheck failed to extract a valid configuration. Use -v for more details.";
msg += "\nThis file is not analyzed. Every tested configuration results in preprocessor errors. It seems that Cppcheck failed to extract a valid configuration. The preprocessor errors:"; msg += "\nThis file is not analyzed. Cppcheck failed to extract a valid configuration. The tested configurations have these preprocessor errors:";
for (const std::string &s : configurationError) for (const std::string &s : configurationError)
msg += "\n " + s; msg += '\n' + s;
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList; std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
ErrorLogger::ErrorMessage::FileLocation loc; ErrorLogger::ErrorMessage::FileLocation loc;