Removing duplicated results

Author: raulgarciamsft

cpp/ql/src/Likely Bugs/Likely Typos/UsingStrcpyAsBoolean.ql

@@ -67,6 +67,8 @@ predicate isStringCopyUsedInCondition( FunctionCall func, Expr expr1, string msg
 
 from FunctionCall func, Expr expr1, string msg
 where 
-  isStringCopyCastedAsBoolean(func, expr1, msg)
+  ( isStringCopyCastedAsBoolean(func, expr1, msg) and 
+    not isStringCopyUsedInCondition(func, expr1, _)
+  )
   or isStringCopyUsedInCondition(func, expr1, msg)
 select expr1, msg

cpp/ql/test/query-tests/Likely Bugs/Likely Typos/UsingStrcpyAsBoolean/UsingStrcpyAsBoolean.expected

@@ -4,30 +4,20 @@
 | test.c:45:9:45:48 | ... && ... | Return Value of strcpy used in a conditional. |
 | test.c:49:9:49:15 | call to strncpy | Return Value of strncpy used in a conditional. |
 | test.c:53:6:53:34 | ! ... | Return Value of strncpy used in a conditional. |
-| test.cpp:75:9:75:14 | call to strcpy | Return Value of strcpy used as boolean. |
 | test.cpp:75:9:75:14 | call to strcpy | Return Value of strcpy used in a conditional. |
 | test.cpp:79:9:79:31 | ! ... | Return Value of strcpy used in a conditional. |
 | test.cpp:79:10:79:15 | call to strcpy | Return Value of strcpy used as boolean. |
 | test.cpp:83:9:83:35 | ... == ... | Return Value of strcpy used in a conditional. |
 | test.cpp:87:9:87:48 | ... && ... | Return Value of strcpy used in a conditional. |
 | test.cpp:87:27:87:32 | call to strcpy | Return Value of strcpy used as boolean. |
-| test.cpp:91:9:91:37 | call to wcscpy | Return Value of wcscpy used as boolean. |
 | test.cpp:91:9:91:37 | call to wcscpy | Return Value of wcscpy used in a conditional. |
-| test.cpp:95:9:95:14 | call to wcscpy | Return Value of wcscpy used as boolean. |
 | test.cpp:95:9:95:14 | call to wcscpy | Return Value of wcscpy used in a conditional. |
-| test.cpp:99:9:99:15 | call to _mbscpy | Return Value of _mbscpy used as boolean. |
 | test.cpp:99:9:99:15 | call to _mbscpy | Return Value of _mbscpy used in a conditional. |
-| test.cpp:103:9:103:15 | call to strncpy | Return Value of strncpy used as boolean. |
 | test.cpp:103:9:103:15 | call to strncpy | Return Value of strncpy used in a conditional. |
-| test.cpp:107:9:107:15 | call to wcsncpy | Return Value of wcsncpy used as boolean. |
 | test.cpp:107:9:107:15 | call to wcsncpy | Return Value of wcsncpy used in a conditional. |
-| test.cpp:111:9:111:16 | call to _mbsncpy | Return Value of _mbsncpy used as boolean. |
 | test.cpp:111:9:111:16 | call to _mbsncpy | Return Value of _mbsncpy used in a conditional. |
-| test.cpp:115:9:115:18 | call to _strncpy_l | Return Value of _strncpy_l used as boolean. |
 | test.cpp:115:9:115:18 | call to _strncpy_l | Return Value of _strncpy_l used in a conditional. |
-| test.cpp:119:9:119:18 | call to _wcsncpy_l | Return Value of _wcsncpy_l used as boolean. |
 | test.cpp:119:9:119:18 | call to _wcsncpy_l | Return Value of _wcsncpy_l used in a conditional. |
-| test.cpp:123:9:123:18 | call to _mbsncpy_l | Return Value of _mbsncpy_l used as boolean. |
 | test.cpp:123:9:123:18 | call to _mbsncpy_l | Return Value of _mbsncpy_l used in a conditional. |
 | test.cpp:127:6:127:34 | ! ... | Return Value of strncpy used in a conditional. |
 | test.cpp:127:7:127:13 | call to strncpy | Return Value of strncpy used as boolean. |