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

Fixed #7677 (skipping of configurations broken?)

This commit is contained in:
Daniel Marjamäki 2016-08-21 12:31:26 +02:00
parent fd6b18f759
commit 19c105cdf9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/cppcheck.cpp
View File

@ -280,8 +280,11 @@ unsigned int CppCheck::processFile(const std::string& filename, const std::strin
// Skip if we already met the same simplified token list // Skip if we already met the same simplified token list
if (_settings.force || _settings.maxConfigs > 1) { if (_settings.force || _settings.maxConfigs > 1) {
const unsigned long long checksum = _tokenizer.list.calculateChecksum(); const unsigned long long checksum = _tokenizer.list.calculateChecksum();
if (checksums.find(checksum) != checksums.end()) if (checksums.find(checksum) != checksums.end()) {
if (_settings.isEnabled("information") && (_settings.debug || _settings.verbose))
purgedConfigurationMessage(filename, cfg);
continue; continue;
}
checksums.insert(checksum); checksums.insert(checksum);
} }
@ -302,8 +305,6 @@ unsigned int CppCheck::processFile(const std::string& filename, const std::strin
} }
} catch (const InternalError &e) { } catch (const InternalError &e) {
if (_settings.isEnabled("information") && (_settings.debug || _settings.verbose))
purgedConfigurationMessage(filename, cfg);
internalErrorFound=true; internalErrorFound=true;
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList; std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
ErrorLogger::ErrorMessage::FileLocation loc; ErrorLogger::ErrorMessage::FileLocation loc;