Fixed danmar#2480 (false positive on unused private function)

Pete Johns · Pete Johns · commit 94aafa482cbf · 2011-01-19T20:32:08.000+11:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -734,8 +734,11 @@ void CheckClass::privateFunctions()
             // or if the function address is used somewhere...
             // eg. sigc::mem_fun(this, &className::classFunction)
             const std::string _pattern2("& " + classname + " :: " + FuncList.front()->str());
+            const std::string methodAsArgument("(|, " + classname + " :: " + FuncList.front()->str() + " ,|)");
             if (!Token::findmatch(_tokenizer->tokens(), _pattern.c_str()) &&
-                !Token::findmatch(_tokenizer->tokens(), _pattern2.c_str()))
+                !Token::findmatch(_tokenizer->tokens(), _pattern2.c_str()) &&
+                !Token::findmatch(_tokenizer->tokens(), methodAsArgument.c_str())
+               )
             {
                 unusedPrivateFunctionError(FuncList.front(), classname, FuncList.front()->str());
             }
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
@@ -60,7 +60,9 @@ class TestUnusedPrivateFunction : public TestFixture
 
         // #2407 - FP when called from operator()
         TEST_CASE(fp_operator);
-        TEST_CASE(testDoesNotIdentifyCallback); // #2480
+        TEST_CASE(testDoesNotIdentifyMethodAsFirstFunctionArgument); // #2480
+        TEST_CASE(testDoesNotIdentifyMethodAsMiddleFunctionArgument);
+        TEST_CASE(testDoesNotIdentifyMethodAsLastFunctionArgument);
     }
 
 
@@ -449,7 +451,7 @@ class TestUnusedPrivateFunction : public TestFixture
         ASSERT_EQUALS("", errout.str());
     }
 
-    void testDoesNotIdentifyCallback()
+    void testDoesNotIdentifyMethodAsFirstFunctionArgument()
     {
         check("#include <iostream>"
               "void callback(void (*func)(int), int arg)"
@@ -474,8 +476,66 @@ class TestUnusedPrivateFunction : public TestFixture
               "{"
               "    MountOperation aExample(10);"
               "}"
-              );
-        TODO_ASSERT_EQUALS("", errout.str());
+             );
+        ASSERT_EQUALS("", errout.str());
+    }
+
+    void testDoesNotIdentifyMethodAsMiddleFunctionArgument()
+    {
+        check("#include <iostream>"
+              "void callback(char, void (*func)(int), int arg)"
+              "{"
+              "    (*func)(arg);"
+              "}"
+              "class MountOperation"
+              "{"
+              "    static void Completed(int i);"
+              "public:"
+              "    MountOperation(int i);"
+              "};"
+              "void MountOperation::Completed(int i)"
+              "{"
+              "    std::cerr << i << std::endl;"
+              "}"
+              "MountOperation::MountOperation(int i)"
+              "{"
+              "    callback('a', MountOperation::Completed, i);"
+              "}"
+              "int main(void)"
+              "{"
+              "    MountOperation aExample(10);"
+              "}"
+             );
+        ASSERT_EQUALS("", errout.str());
+    }
+
+    void testDoesNotIdentifyMethodAsLastFunctionArgument()
+    {
+        check("#include <iostream>"
+              "void callback(int arg, void (*func)(int))"
+              "{"
+              "    (*func)(arg);"
+              "}"
+              "class MountOperation"
+              "{"
+              "    static void Completed(int i);"
+              "public:"
+              "    MountOperation(int i);"
+              "};"
+              "void MountOperation::Completed(int i)"
+              "{"
+              "    std::cerr << i << std::endl;"
+              "}"
+              "MountOperation::MountOperation(int i)"
+              "{"
+              "    callback(i, MountOperation::Completed);"
+              "}"
+              "int main(void)"
+              "{"
+              "    MountOperation aExample(10);"
+              "}"
+             );
+        ASSERT_EQUALS("", errout.str());
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -734,8 +734,11 @@ void CheckClass::privateFunctions()`
`734`	`734`	`// or if the function address is used somewhere...`
`735`	`735`	`// eg. sigc::mem_fun(this, &className::classFunction)`
`736`	`736`	`const std::string _pattern2("& " + classname + " :: " + FuncList.front()->str());`
	`737`	`+ const std::string methodAsArgument("(\|, " + classname + " :: " + FuncList.front()->str() + " ,\|)");`
`737`	`738`	`if (!Token::findmatch(_tokenizer->tokens(), _pattern.c_str()) &&`
`738`		`- !Token::findmatch(_tokenizer->tokens(), _pattern2.c_str()))`
	`739`	`+ !Token::findmatch(_tokenizer->tokens(), _pattern2.c_str()) &&`
	`740`	`+ !Token::findmatch(_tokenizer->tokens(), methodAsArgument.c_str())`
	`741`	`+ )`
`739`	`742`	`{`
`740`	`743`	`unusedPrivateFunctionError(FuncList.front(), classname, FuncList.front()->str());`
`741`	`744`	`}`