fix #11824

Author: clock999

cli/cmdlineparser.cpp

@@ -439,11 +439,11 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
     }
 
     bool def = false;
-    bool maxconfigs = false;
 
     ImportProject project;
 
     bool executorAuto = true;
+    bool is_set_max_config = false;
 
     for (int i = 1; i < argc; i++) {
         if (argv[i][0] != '-') {
@@ -984,10 +984,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mLogger.printError("argument to '--max-configs=' must be greater than 0.");
                 return Result::Fail;
             }
-
+            is_set_max_config = true;
             mSettings.maxConfigs = tmp;
-            mSettings.force = false;
-            maxconfigs = true;
         }
 
         // max ctu depth
@@ -1157,7 +1155,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 return Result::Fail;
             }
 
-            mSettings.checkAllConfigurations = false;     // Can be overridden with --max-configs or --force
             std::string projectFile = argv[i]+10;
             ImportProject::Type projType = project.import(projectFile, &mSettings, &mSuppressions);
             project.projectType = projType;
@@ -1551,6 +1548,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         }
     }
 
+    if (is_set_max_config) {
+        mSettings.force = false;
+    }
+
     if (!loadCppcheckCfg())
         return Result::Fail;
 
@@ -1568,15 +1569,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
     substituteTemplateFormatStatic(mSettings.templateFormat);
     substituteTemplateLocationStatic(mSettings.templateLocation);
 
-    if (mSettings.force || maxconfigs)
-        mSettings.checkAllConfigurations = true;
-
-    if (mSettings.force)
-        mSettings.maxConfigs = INT_MAX;
-
-    else if ((def || mSettings.preprocessOnly) && !maxconfigs)
-        mSettings.maxConfigs = 1U;
-
     if (mSettings.jobs > 1 && mSettings.buildDir.empty()) {
         // TODO: bail out instead?
         if (mSettings.checks.isEnabled(Checks::unusedFunction))

gui/mainwindow.cpp

@@ -1101,14 +1101,6 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
             supprs.nomsg.addSuppression(suppression); // TODO: check result
         }
 
-        // Only check the given -D configuration
-        if (!defines.isEmpty())
-            settings.maxConfigs = 1;
-
-        // If importing a project, only check the given configuration
-        if (!mProjectFile->getImportProject().isEmpty())
-            settings.checkAllConfigurations = false;
-
         const QString &buildDir = fromNativePath(mProjectFile->getBuildDir());
         if (!buildDir.isEmpty()) {
             if (QDir(buildDir).isAbsolute()) {

lib/cppcheck.cpp

@@ -1014,16 +1014,33 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
 
         // Get configurations..
         std::set<std::string> configurations;
-        if ((mSettings.checkAllConfigurations && mSettings.userDefines.empty()) || mSettings.force) {
-            Timer::run("Preprocessor::getConfigs", mSettings.showtime, &s_timerResults, [&]() {
+        Timer::run("Preprocessor::getConfigs", mSettings.showtime, &s_timerResults, [&]() {
                 configurations = preprocessor.getConfigs(tokens1);
-            });
+        });
+
+        std::list<std::string> configs_total;
+        if (!mSettings.userDefines.empty()) {
+            configs_total.push_back(mSettings.userDefines);
+        }
+
+        int max_config_tmp;
+        if (mSettings.force) {
+            max_config_tmp = configurations.size();
         } else {
-            configurations.insert(mSettings.userDefines);
+            if (mSettings.preprocessOnly) {
+                max_config_tmp = 1;
+            } else {
+                max_config_tmp = mSettings.maxConfigs;
+            }
+            max_config_tmp = max_config_tmp - configs_total.size();
+        }
+
+        for (auto it = configurations.begin(); it != configurations.end() && max_config_tmp > 0; ++it, max_config_tmp--) {
+            configs_total.push_back(*it);
         }
 
         if (mSettings.checkConfiguration) {
-            for (const std::string &config : configurations)
+            for (const std::string &config : configs_total)
                 (void)preprocessor.getcode(tokens1, config, files, true);
 
             if (analyzerInformation)
@@ -1046,10 +1063,10 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
             executeRules("define", tokenlist);
         }
 #endif
-
-        if (!mSettings.force && configurations.size() > mSettings.maxConfigs) {
+        int max_total = configurations.size() + mSettings.userDefines.empty() ? 0 : 1;
+        if (!mSettings.force && max_total > mSettings.maxConfigs) {
             if (mSettings.severity.isEnabled(Severity::information)) {
-                tooManyConfigsError(Path::toNativeSeparators(file.spath()),configurations.size());
+                tooManyConfigsError(Path::toNativeSeparators(file.spath()), max_total);
             } else {
                 mTooManyConfigs = true;
             }
@@ -1069,30 +1086,14 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
         }
 
         std::set<unsigned long long> hashes;
-        int checkCount = 0;
         bool hasValidConfig = false;
         std::list<std::string> configurationError;
-        for (const std::string &currCfg : configurations) {
+        for (const std::string &currCfg : configs_total) {
             // bail out if terminated
             if (Settings::terminated())
                 break;
 
-            // Check only a few configurations (default 12), after that bail out, unless --force
-            // was used.
-            if (!mSettings.force && ++checkCount > mSettings.maxConfigs)
-                break;
-
-            if (!mSettings.userDefines.empty()) {
-                mCurrentConfig = mSettings.userDefines;
-                const std::vector<std::string> v1(split(mSettings.userDefines, ";"));
-                for (const std::string &cfg: split(currCfg, ";")) {
-                    if (std::find(v1.cbegin(), v1.cend(), cfg) == v1.cend()) {
-                        mCurrentConfig += ";" + cfg;
-                    }
-                }
-            } else {
-                mCurrentConfig = currCfg;
-            }
+            mCurrentConfig = currCfg;
 
             if (mSettings.preprocessOnly) {
                 std::string codeWithoutCfg;
@@ -1132,7 +1133,7 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
                 mLogger->setLocationMacros(tokenizer.tokens(), files);
 
                 // If only errors are printed, print filename after the check
-                if (!mSettings.quiet && (!mCurrentConfig.empty() || checkCount > 1)) {
+                if (!mSettings.quiet && (!mCurrentConfig.empty())) {
                     std::string fixedpath = Path::toNativeSeparators(file.spath());
                     mErrorLogger.reportOut("Checking " + fixedpath + ": " + mCurrentConfig + "...", Color::FgGreen);
                 }
@@ -1187,9 +1188,8 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
             } catch (const simplecpp::Output &o) {
                 // #error etc during preprocessing
                 configurationError.push_back((mCurrentConfig.empty() ? "\'\'" : mCurrentConfig) + " : [" + o.location.file() + ':' + std::to_string(o.location.line) + "] " + o.msg);
-                --checkCount; // don't count invalid configurations
 
-                if (!hasValidConfig && currCfg == *configurations.rbegin()) {
+                if (!hasValidConfig && currCfg == *configs_total.rbegin()) {
                     // If there is no valid configuration then report error..
                     std::string locfile = Path::fromNativeSeparators(o.location.file());
                     if (mSettings.relativePaths)
@@ -1218,7 +1218,7 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
             }
         }
 
-        if (!hasValidConfig && configurations.size() > 1 && mSettings.severity.isEnabled(Severity::information)) {
+        if (!hasValidConfig && configs_total.size() > 1 && mSettings.severity.isEnabled(Severity::information)) {
             std::string msg;
             msg = "This file is not analyzed. Cppcheck failed to extract a valid configuration. Use -v for more details.";
             msg += "\nThis file is not analyzed. Cppcheck failed to extract a valid configuration. The tested configurations have these preprocessor errors:";

lib/settings.h

@@ -129,9 +129,6 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief --cppcheck-build-dir. Always uses / as path separator. No trailing path separator. */
     std::string buildDir;
 
-    /** @brief check all configurations (false if -D or --max-configs is used */
-    bool checkAllConfigurations = true;
-
     /** Is the 'configuration checking' wanted? */
     bool checkConfiguration{};