Fixed cppcheck-opensource#669 (possible style without --all + false positives)

Daniel Marjamäki · Daniel Marjamäki · commit 36c7108a2821 · 2009-09-15T20:46:47.000+02:00
diff --git a/src/checkother.cpp b/src/checkother.cpp
@@ -454,6 +454,9 @@ void CheckOther::invalidFunctionUsage()
 
 void CheckOther::checkUnsignedDivision()
 {
+    if (!_settings->_showAll || !_settings->_checkCodingStyle)
+        return;
+
     // Check for "ivar / uvar" and "uvar / ivar"
     std::map<std::string, char> varsign;
     for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
@@ -1307,7 +1310,7 @@ void CheckOther::udivError(const Token *tok)
 
 void CheckOther::udivWarning(const Token *tok)
 {
-    reportError(tok, Severity::possibleStyle, "udivWarning", "Warning: Division with signed and unsigned operators");
+    reportError(tok, Severity::possibleStyle, "udivWarning", "Division with signed and unsigned operators");
 }
 
 void CheckOther::unusedStructMemberError(const Token *tok, const std::string &structname, const std::string &varname)
diff --git a/test/testdivision.cpp b/test/testdivision.cpp
@@ -36,7 +36,7 @@ class TestDivision : public TestFixture
     { }
 
 private:
-    void check(const char code[])
+    void check(const char code[], bool style = true, bool all = true)
     {
         // Tokenize..
         Tokenizer tokenizer;
@@ -47,8 +47,8 @@ class TestDivision : public TestFixture
         errout.str("");
 
         Settings settings;
-        settings._showAll = true;
-        settings._checkCodingStyle = true;
+        settings._showAll = all;
+        settings._checkCodingStyle = style;
 
         // Check for unsigned divisions..
         CheckOther checkOther(&tokenizer, &settings, this);
@@ -64,6 +64,7 @@ class TestDivision : public TestFixture
         TEST_CASE(division5);
         TEST_CASE(division6);
         TEST_CASE(division7);
+        TEST_CASE(division8);
     }
 
     void division1()
@@ -74,7 +75,7 @@ class TestDivision : public TestFixture
               "    unsigned int uvar = 2;\n"
               "    return ivar / uvar;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (possible style) Warning: Division with signed and unsigned operators\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5]: (possible style) Division with signed and unsigned operators\n", errout.str());
     }
 
     void division2()
@@ -85,7 +86,7 @@ class TestDivision : public TestFixture
               "    unsigned int uvar = 2;\n"
               "    return uvar / ivar;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (possible style) Warning: Division with signed and unsigned operators\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5]: (possible style) Division with signed and unsigned operators\n", errout.str());
     }
 
     void division3()
@@ -98,7 +99,7 @@ class TestDivision : public TestFixture
               "    u32 uvar = 2;\n"
               "    return uvar / ivar;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7]: (possible style) Warning: Division with signed and unsigned operators\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7]: (possible style) Division with signed and unsigned operators\n", errout.str());
     }
 
     void division4()
@@ -146,6 +147,36 @@ class TestDivision : public TestFixture
              );
         ASSERT_EQUALS("[test.cpp:4]: (error) Unsigned division. The result will be wrong.\n", errout.str());
     }
+
+    void division8()
+    {
+        check("void foo(int b)\n"
+              "{\n"
+              "    if (b > 0)\n"
+              "    {\n"
+              "         unsigned int a;\n"
+              "         unsigned int c = a / b;\n"
+              "    }\n", false, true);
+        ASSERT_EQUALS("", errout.str());
+
+        check("void foo(int b)\n"
+              "{\n"
+              "    if (b > 0)\n"
+              "    {\n"
+              "         unsigned int a;\n"
+              "         unsigned int c = a / b;\n"
+              "    }\n", true, false);
+        ASSERT_EQUALS("", errout.str());
+
+        check("void foo(int b)\n"
+              "{\n"
+              "    if (b > 0)\n"
+              "    {\n"
+              "         unsigned int a;\n"
+              "         unsigned int c = a / b;\n"
+              "    }\n", true, true);
+        ASSERT_EQUALS("[test.cpp:6]: (possible style) Division with signed and unsigned operators\n", errout.str());
+    }
 };
 
 REGISTER_TEST(TestDivision)

Original file line number	Diff line number	Diff line change
`@@ -454,6 +454,9 @@ void CheckOther::invalidFunctionUsage()`
`454`	`454`
`455`	`455`	`void CheckOther::checkUnsignedDivision()`
`456`	`456`	`{`
	`457`	`+ if (!_settings->_showAll \|\| !_settings->_checkCodingStyle)`
	`458`	`+ return;`
	`459`	`+`
`457`	`460`	`// Check for "ivar / uvar" and "uvar / ivar"`
`458`	`461`	`std::map<std::string, char> varsign;`
`459`	`462`	`for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())`
`@@ -1307,7 +1310,7 @@ void CheckOther::udivError(const Token *tok)`
`1307`	`1310`
`1308`	`1311`	`void CheckOther::udivWarning(const Token *tok)`
`1309`	`1312`	`{`
`1310`		`- reportError(tok, Severity::possibleStyle, "udivWarning", "Warning: Division with signed and unsigned operators");`
	`1313`	`+ reportError(tok, Severity::possibleStyle, "udivWarning", "Division with signed and unsigned operators");`
`1311`	`1314`	`}`
`1312`	`1315`
`1313`	`1316`	`void CheckOther::unusedStructMemberError(const Token *tok, const std::string &structname, const std::string &varname)`