Experimental fix for #13825 (toomanyconfigs lacks file information)

Author: danmar

cli/cppcheckexecutor.cpp

@@ -432,10 +432,6 @@ int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& sup
             returnValue = settings.exitCode;
     }
 
-    if (!settings.checkConfiguration) {
-        cppcheck.tooManyConfigsError("",0U);
-    }
-
     stdLogger.writeCheckersReport(supprs);
 
     if (settings.outputFormat == Settings::OutputFormat::xml) {

lib/cppcheck.cpp

@@ -1079,13 +1079,8 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
         }
 #endif
 
-        if (!mSettings.force && configurations.size() > mSettings.maxConfigs) {
-            if (mSettings.severity.isEnabled(Severity::information)) {
-                tooManyConfigsError(Path::toNativeSeparators(file.spath()),configurations.size());
-            } else {
-                mTooManyConfigs = true;
-            }
-        }
+        if (!mSettings.force && configurations.size() > mSettings.maxConfigs)
+            tooManyConfigsError(Path::toNativeSeparators(file.spath()), configurations.size());
 
         FilesDeleter filesDeleter;
 
@@ -1661,12 +1656,7 @@ void CppCheck::executeAddonsWholeProgram(const std::list<FileWithDetails> &files
 
 void CppCheck::tooManyConfigsError(const std::string &file, const int numberOfConfigurations)
 {
-    if (!mSettings.severity.isEnabled(Severity::information) && !mTooManyConfigs)
-        return;
-
-    mTooManyConfigs = false;
-
-    if (mSettings.severity.isEnabled(Severity::information) && file.empty())
+    if (!mSettings.severity.isEnabled(Severity::information))
         return;
 
     std::list<ErrorMessage::FileLocation> loclist;
@@ -1700,8 +1690,6 @@ void CppCheck::tooManyConfigsError(const std::string &file, const int numberOfCo
 
 void CppCheck::purgedConfigurationMessage(const std::string &file, const std::string& configuration)
 {
-    mTooManyConfigs = false;
-
     if (mSettings.severity.isEnabled(Severity::information) && file.empty())
         return;
 
@@ -1730,7 +1718,6 @@ void CppCheck::getErrorMessages(ErrorLogger &errorlogger)
 
     CppCheck cppcheck(settings, supprs, errorlogger, true, nullptr);
     cppcheck.purgedConfigurationMessage("","");
-    cppcheck.mTooManyConfigs = true;
     cppcheck.tooManyConfigsError("",0U);
     // TODO: add functions to get remaining error messages
 

lib/cppcheck.h

@@ -249,9 +249,6 @@ class CPPCHECKLIB CppCheck {
 
     bool mUseGlobalSuppressions;
 
-    /** Are there too many configs? */
-    bool mTooManyConfigs{};
-
     /** File info used for whole program analysis */
     std::list<Check::FileInfo*> mFileInfo;