fix

Author: danmar

cli/cmdlineparser.cpp

@@ -797,8 +797,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         }
 
         // Force checking of files that have "too many" configurations
-        else if (std::strcmp(argv[i], "-f") == 0 || std::strcmp(argv[i], "--force") == 0)
+        else if (std::strcmp(argv[i], "-f") == 0 || std::strcmp(argv[i], "--force") == 0) {
             mSettings.force = true;
+            mSettings.maxConfigsOption = Settings::maxConfigsNotAssigned;
+        }
 
         else if (std::strcmp(argv[i], "--fsigned-char") == 0)
             defaultSign = 's';
@@ -971,6 +973,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             }
 
             mSettings.maxConfigsOption = tmp;
+            mSettings.force = false;
         }
 
         // max ctu depth

lib/cppcheck.cpp

@@ -1199,7 +1199,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
                     }
 
                     // Skip if we already met the same simplified token list
-                    if (!hashes.empty()) {
+                    if (maxConfigs > 1) {
                         const std::size_t hash = tokenizer.list.calculateHash();
                         if (hashes.find(hash) != hashes.end()) {
                             if (mSettings.debugwarnings)