fix

danmar · Jun 28, 2023 · 505ac4b · 505ac4b
1 parent 3ee90e2
commit 505ac4b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -263,7 +263,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
             }
 
             else if (std::strncmp(argv[i], "--checks-max-time=", 18) == 0) {
-                if (!parseNumberArg(argv[i], 18, mSettings.checksMaxTime))
+                if (!parseNumberArg(argv[i], 18, mSettings.checksMaxTime, true))
                     return false;
             }
 

diff --git a/cli/cmdlineparser.h b/cli/cmdlineparser.h
@@ -123,17 +123,16 @@ class CmdLineParser {
 private:
     bool isCppcheckPremium() const;
 
-    // TODO: get rid of is_signed
     template<typename T>
-    static bool parseNumberArg(const char* const arg, std::size_t offset, T& num, bool is_signed = false)
+    static bool parseNumberArg(const char* const arg, std::size_t offset, T& num, bool mustBePositive = false)
     {
         T tmp;
         std::string err;
         if (!strToInt(arg + offset, tmp, &err)) {
             printError("argument to '" + std::string(arg, offset) + "' is not valid - " + err + ".");
             return false;
         }
-        if (is_signed && tmp < 0) {
+        if (mustBePositive && tmp < 0) {
             printError("argument to '" + std::string(arg, offset) + "' needs to be a positive integer.");
             return false;
         }

diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -1694,7 +1694,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--checks-max-time=-1", "file.cpp"};
         ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' needs to be a positive integer.\n", GET_REDIRECT_OUTPUT);
     }
 
     void checksMaxTimeInvalid() {