Merge pull request #40 from joshbeck/master

Added option to set #ifdef configuration check limit

cli/cmdlineparser.cpp

@@ -561,6 +561,25 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
             }
         }
 
+        // Set maximum number of #ifdef configurations to check
+        else if (strncmp(argv[i], "--max-configs=", 14) == 0)
+        {
+            _settings->_force = false;
+
+            std::istringstream iss(14+argv[i]);
+            if (!(iss >> _settings->_maxConfigs))
+            {
+                PrintMessage("cppcheck: argument to '--max-configs=' is not a number");
+                return false;
+            }
+
+            if (_settings->_maxConfigs < 1)
+            {
+                PrintMessage("cppcheck: argument to '--max-configs=' must be greater than 0");
+                return false;
+            }
+        }
+
         // Print help
         else if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
             _pathnames.clear();
@@ -660,8 +679,9 @@ void CmdLineParser::PrintHelp()
               "    --file-list=<file>   Specify the files to check in a text file. Add one\n"
               "                         filename per line. When file is -, the file list will\n"
               "                         be read from standard input.\n"
-              "    -f, --force          Force checking of all configurations in files that have\n"
+              "    -f, --force          Force checking of all configurations in files. If used\n" 
-              "                         \"too many\" configurations.\n"
+              "                         together with --max-ifdefs=, the last option is the one\n" 
+              "                         that is effective.\n"
               "    -h, --help           Print this help.\n"
               "    -I <dir>             Give include path. Give several -I parameters to give\n"
               "                         several paths. First given path is checked first. If\n"
@@ -674,6 +694,11 @@ void CmdLineParser::PrintHelp()
               "                         more comments, like: // cppcheck-suppress warningId\n"
               "                         on the lines before the warning to suppress.\n"
               "    -j <jobs>            Start [jobs] threads to do the checking simultaneously.\n"
+              "    --max-configs=<limit>\n"
+              "                         Maximum number of configurations to check in a file\n"  
+              "                         before skipping it. Default is 12. If used together\n"
+              "                         with --force, the last option is the one that is\n"
+              "                         effective.\n"
               "    --platform=<type>    Specifies platform specific types and sizes. The\n"
               "                         available platforms are:\n"
               "                          * unix32\n"

lib/cppcheck.cpp

@@ -195,9 +195,9 @@ unsigned int CppCheck::processFile()
 
         int checkCount = 0;
         for (std::list<std::string>::const_iterator it = configurations.begin(); it != configurations.end(); ++it) {
-            // Check only 12 first configurations, after that bail out, unless --force
+            // Check only a few configurations (default 12), after that bail out, unless --force
             // was used.
-            if (!_settings._force && checkCount > 11) {
+            if (!_settings._force && checkCount >= _settings._maxConfigs) {
 
                 const std::string fixedpath = Path::toNativeSeparators(_filename);
                 ErrorLogger::ErrorMessage::FileLocation location;

lib/settings.cpp

@@ -38,6 +38,7 @@ Settings::Settings()
     _showtime = 0; // TODO: use enum
     _append = "";
     _terminate = false;
+    _maxConfigs = 12;
     inconclusive = false;
     experimental = false;
     test_2_pass = false;

lib/settings.h

@@ -121,6 +121,10 @@ public:
     /** @brief get append code (--append) */
     std::string append() const;
 
+    /** @brief Maximum number of configurations to check before bailing. 
+        Default is 12. (--max-configs=N) */
+    int _maxConfigs;
+
     /**
      * @brief Returns true if given id is in the list of
      * enabled extra checks (--enable)

man/cppcheck.1.xml

@@ -116,6 +116,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       <arg choice="opt"><option>-i&lt;dir&gt;</option></arg>
       <arg choice="opt"><option>--inline-suppr</option></arg>
       <arg choice="opt"><option>-j&lt;jobs&gt;</option></arg>
+      <arg choice="opt"><option>--max-configs=&lt;limit&gt;</option></arg>
       <arg choice="opt"><option>--platform=&lt;type&gt;</option></arg>
       <arg choice="opt"><option>--quiet</option></arg>
       <arg choice="opt"><option>--report-progress</option></arg>
@@ -253,7 +254,7 @@ Example: -DDEBUG=1 -D__cplusplus</para>
         <term><option>--force</option></term>
         <listitem>
           <para>Force checking of files that have a lot of configurations. Error is printed if such a file is found so there is no reason to use this by
-default.</para>
+default. If used together with --max-ifdefs=, the last option is the one that is effective.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -292,6 +293,13 @@ Directory name is matched to all parts of the path.</para>
           <para>Start &lt;jobs&gt; threads to do the checking work.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--max-configs=&lt;limit&gt;</option></term>
+        <listitem>
+          <para>Maximum number of configurations to check in a file before skipping it. Default is 12. If used together with --force, the last option is
+          the one that is effective.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term><option>--platform=&lt;type&gt;</option></term>
         <listitem>

test/testcmdlineparser.cpp

@@ -74,6 +74,10 @@ private:
         TEST_CASE(jobs);
         TEST_CASE(jobsMissingCount);
         TEST_CASE(jobsInvalid);
+        TEST_CASE(maxConfigs);
+        TEST_CASE(maxConfigsMissingCount);
+        TEST_CASE(maxConfigsInvalid);
+        TEST_CASE(maxConfigsTooSmall);
         TEST_CASE(reportProgressTest); // "Test" suffix to avoid hiding the parent's reportProgress
         TEST_CASE(stdposix);
         TEST_CASE(stdc99);
@@ -537,6 +541,43 @@ private:
         ASSERT_EQUALS(false, parser.ParseFromArgs(4, argv));
     }
 
+    void maxConfigs() {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "-f", "--max-configs=12", "file.cpp"};
+        Settings settings;
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(4, argv));
+        ASSERT_EQUALS(12, settings._maxConfigs);
+        ASSERT_EQUALS(false, settings._force);        
+    }
+
+    void maxConfigsMissingCount() {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "--max-configs=", "file.cpp"};
+        Settings settings;
+        CmdLineParser parser(&settings);
+        // Fails since --max-configs= is missing limit
+        ASSERT_EQUALS(false, parser.ParseFromArgs(3, argv));
+    }
+
+    void maxConfigsInvalid() {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "--max-configs=e", "file.cpp"};
+        Settings settings;
+        CmdLineParser parser(&settings);
+        // Fails since invalid count given for --max-configs=
+        ASSERT_EQUALS(false, parser.ParseFromArgs(3, argv));
+    }
+
+    void maxConfigsTooSmall() {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "--max-configs=0", "file.cpp"};
+        Settings settings;
+        CmdLineParser parser(&settings);
+        // Fails since limit must be greater than 0
+        ASSERT_EQUALS(false, parser.ParseFromArgs(3, argv));
+	}
+
     void reportProgressTest() {
         REDIRECT;
         const char *argv[] = {"cppcheck", "--report-progress", "file.cpp"};