Fixed cppcheck-opensource#4618 (Unmatched suppression: don't show this information message unless --enable=information or --check-cfg is used)

danmar · danmar · commit a7da65a40b4b · 2013-05-31T15:20:58.000+02:00
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -191,10 +191,10 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
         returnValue = executor.check();
     }
 
-    if (!settings.checkConfiguration) {
-        if (!settings._errorsOnly)
-            reportUnmatchedSuppressions(settings.nomsg.getUnmatchedGlobalSuppressions());
+    if (settings.isEnabled("information") || settings.checkConfiguration)
+        reportUnmatchedSuppressions(settings.nomsg.getUnmatchedGlobalSuppressions());
 
+    if (!settings.checkConfiguration) {
         cppCheck.tooManyConfigsError("",0U);
 
         if (settings.isEnabled("missingInclude") && Preprocessor::missingIncludeFlag) {
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -215,7 +215,7 @@ unsigned int CppCheck::processFile(const std::string& filename)
         internalError(filename, e.errorMessage);
     }
 
-    if (!_settings._errorsOnly)
+    if (_settings.isEnabled("information") || _settings.checkConfiguration)
         reportUnmatchedSuppressions(_settings.nomsg.getUnmatchedLocalSuppressions(filename));
 
     _errorList.clear();
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
@@ -121,6 +121,7 @@ class TestSuppressions : public TestFixture {
         CppCheck cppCheck(*this, true);
         Settings& settings = cppCheck.settings();
         settings._inlineSuppressions = true;
+        settings.addEnabled("information");
         if (!suppression.empty()) {
             std::string r = settings.nomsg.addSuppressionLine(suppression);
             ASSERT_EQUALS("", r);
@@ -141,6 +142,7 @@ class TestSuppressions : public TestFixture {
         Settings settings;
         settings._jobs = 1;
         settings._inlineSuppressions = true;
+        settings.addEnabled("information");
         if (!suppression.empty()) {
             std::string r = settings.nomsg.addSuppressionLine(suppression);
             ASSERT_EQUALS("", r);
@@ -162,6 +164,7 @@ class TestSuppressions : public TestFixture {
         CppCheck cppCheck(*this, true);
         Settings& settings = cppCheck.settings();
         settings._inlineSuppressions = true;
+        settings.addEnabled("information");
         if (!suppression.empty())
             settings.nomsg.addSuppressionLine(suppression);
 

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ unsigned int CppCheck::processFile(const std::string& filename)`
`215`	`215`	`internalError(filename, e.errorMessage);`
`216`	`216`	`}`
`217`	`217`
`218`		`- if (!_settings._errorsOnly)`
	`218`	`+ if (_settings.isEnabled("information") \|\| _settings.checkConfiguration)`
`219`	`219`	`reportUnmatchedSuppressions(_settings.nomsg.getUnmatchedLocalSuppressions(filename));`
`220`	`220`
`221`	`221`	`_errorList.clear();`