Fixed danmar#1932 (false positive: unused private function)

eriklax · Daniel Marjam&auml;ki · commit 54b7f972c982 · 2010-08-15T07:44:08.000+02:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -1173,7 +1173,12 @@ void CheckClass::privateFunctions()
         {
             // Final check; check if the function pointer is used somewhere..
             const std::string _pattern("return|(|)|,|= " + FuncList.front()->str());
-            if (!Token::findmatch(_tokenizer->tokens(), _pattern.c_str()))
+
+            // or if the function address is used somewhere...
+            // eg. sigc::mem_fun(this, &className::classFunction)
+            const std::string _pattern2("& " + classname + " :: " + FuncList.front()->str());
+            if (!Token::findmatch(_tokenizer->tokens(), _pattern.c_str()) &&
+                !Token::findmatch(_tokenizer->tokens(), _pattern2.c_str()))
             {
                 unusedPrivateFunctionError(FuncList.front(), classname, FuncList.front()->str());
             }
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
@@ -43,6 +43,7 @@ class TestUnusedPrivateFunction : public TestFixture
         // [ 2236547 ] False positive --style unused function, called via pointer
         TEST_CASE(func_pointer1);
         TEST_CASE(func_pointer2);
+        TEST_CASE(func_pointer3);
 
         TEST_CASE(ctor);
 
@@ -254,6 +255,19 @@ class TestUnusedPrivateFunction : public TestFixture
     }
 
 
+    void func_pointer3()
+    {
+        check("class c1\n"
+              "{\n"
+              "public:\n"
+              "    c1()\n"
+              "    { sigc::mem_fun(this, &c1::f1); }\n"
+              "\n"
+              "private:\n"
+              "    void f1() const {}\n"
+              "};\n");
+        ASSERT_EQUALS("", errout.str());
+    }
 
 
     void ctor()

Original file line number	Diff line number	Diff line change
`@@ -1173,7 +1173,12 @@ void CheckClass::privateFunctions()`
`1173`	`1173`	`{`
`1174`	`1174`	`// Final check; check if the function pointer is used somewhere..`
`1175`	`1175`	`const std::string _pattern("return\|(\|)\|,\|= " + FuncList.front()->str());`
`1176`		`- if (!Token::findmatch(_tokenizer->tokens(), _pattern.c_str()))`
	`1176`	`+`
	`1177`	`+ // or if the function address is used somewhere...`
	`1178`	`+ // eg. sigc::mem_fun(this, &className::classFunction)`
	`1179`	`+ const std::string _pattern2("& " + classname + " :: " + FuncList.front()->str());`
	`1180`	`+ if (!Token::findmatch(_tokenizer->tokens(), _pattern.c_str()) &&`
	`1181`	`+ !Token::findmatch(_tokenizer->tokens(), _pattern2.c_str()))`
`1177`	`1182`	`{`
`1178`	`1183`	`unusedPrivateFunctionError(FuncList.front(), classname, FuncList.front()->str());`
`1179`	`1184`	`}`