Fixed cppcheck-opensource#1994 (False 'Found obsolete function' positive)

Daniel Marjamäki · Daniel Marjamäki · commit 02939c78f857 · 2010-08-29T12:01:32.000+02:00
diff --git a/lib/checkobsoletefunctions.cpp b/lib/checkobsoletefunctions.cpp
@@ -41,7 +41,7 @@ void CheckObsoleteFunctions::obsoleteFunctions()
         std::list< std::pair<const std::string, const std::string> >::const_iterator it(_obsoleteFunctions.begin()), itend(_obsoleteFunctions.end());
         for (; it!=itend; ++it)
         {
-            if (tok->strAt(1) == it->first && tok->strAt(2) == "(" && tok->tokAt(1)->varId() == 0 && !tok->tokAt(0)->isName() && tok->strAt(0) != "." && tok->strAt(0) != "::")
+            if (tok->strAt(1) == it->first && tok->strAt(2) == "(" && tok->tokAt(1)->varId() == 0 && !tok->tokAt(0)->isName() && !Token::Match(tok, ".|::|:|,"))
             {
                 reportError(tok->tokAt(1), Severity::style, "obsoleteFunctions"+it->first, it->second);
                 break;
diff --git a/test/testobsoletefunctions.cpp b/test/testobsoletefunctions.cpp
@@ -33,6 +33,18 @@ class TestObsoleteFunctions : public TestFixture
 
 private:
 
+    void run()
+    {
+        TEST_CASE(testbsd_signal);
+        TEST_CASE(testgethostbyname);
+        TEST_CASE(testgethostbyaddr);
+        TEST_CASE(testusleep);
+        TEST_CASE(testindex);
+        TEST_CASE(testrindex);
+
+        // no false positives for variables
+        TEST_CASE(var);
+    }
 
 
     void check(const char code[])
@@ -60,16 +72,6 @@ class TestObsoleteFunctions : public TestFixture
         checkObsoleteFunctions.obsoleteFunctions();
     }
 
-    void run()
-    {
-        TEST_CASE(testbsd_signal);
-        TEST_CASE(testgethostbyname);
-        TEST_CASE(testgethostbyaddr);
-        TEST_CASE(testusleep);
-        TEST_CASE(testindex);
-        TEST_CASE(testrindex);
-    }
-
     void testbsd_signal()
     {
         check("void f()\n"
@@ -179,7 +181,15 @@ class TestObsoleteFunctions : public TestFixture
     }
 
 
-
+    void var()
+    {
+        check("class Fred {\n"
+              "public:\n"
+              "    Fred() : index(0) { }\n"
+              "    int index;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout.str());
+    }
 
 };
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void CheckObsoleteFunctions::obsoleteFunctions()`
`41`	`41`	`std::list< std::pair<const std::string, const std::string> >::const_iterator it(_obsoleteFunctions.begin()), itend(_obsoleteFunctions.end());`
`42`	`42`	`for (; it!=itend; ++it)`
`43`	`43`	`{`
`44`		`- if (tok->strAt(1) == it->first && tok->strAt(2) == "(" && tok->tokAt(1)->varId() == 0 && !tok->tokAt(0)->isName() && tok->strAt(0) != "." && tok->strAt(0) != "::")`
	`44`	`+ if (tok->strAt(1) == it->first && tok->strAt(2) == "(" && tok->tokAt(1)->varId() == 0 && !tok->tokAt(0)->isName() && !Token::Match(tok, ".\|::\|:\|,"))`
`45`	`45`	`{`
`46`	`46`	`reportError(tok->tokAt(1), Severity::style, "obsoleteFunctions"+it->first, it->second);`
`47`	`47`	`break;`