C++: Make output clearer in cases where the function name is a macro expansion (I've seen this more than once).

Author: geoffw0

cpp/ql/src/experimental/Security/CWE/CWE-1240/CustomCryptographicPrimitive.ql

@@ -82,4 +82,6 @@ where
   amount = strictcount(Expr e | computeHeuristic(e) and e.getEnclosingFunction() = f) and
   amount >= 8 and
   exists(f.getFile().getRelativePath()) // exclude library files
-select f, "This may be a custom implementation of a cryptographic primitive."
+select f,
+  "This function, \"" + f.getName() +
+    "\", may be a custom implementation of a cryptographic primitive."

cpp/ql/test/experimental/query-tests/Security/CWE/CWE-1240/CustomCryptographicPrimitive.expected

@@ -1,3 +1,3 @@
-| tests_crypto.cpp:11:6:11:18 | encryptString | This may be a custom implementation of a cryptographic primitive. |
-| tests_crypto.cpp:30:6:30:14 | MyEncrypt | This may be a custom implementation of a cryptographic primitive. |
-| tests_crypto.cpp:83:6:83:18 | init_aes_sbox | This may be a custom implementation of a cryptographic primitive. |
+| tests_crypto.cpp:11:6:11:18 | encryptString | This function, "encryptString", may be a custom implementation of a cryptographic primitive. |
+| tests_crypto.cpp:30:6:30:14 | MyEncrypt | This function, "MyEncrypt", may be a custom implementation of a cryptographic primitive. |
+| tests_crypto.cpp:83:6:83:18 | init_aes_sbox | This function, "init_aes_sbox", may be a custom implementation of a cryptographic primitive. |