Remove placeholders from query output

Author: Nikita Kraiouchkine

c/cert/src/rules/EXP37-C/DoNotCallFunctionsWithIncompatibleArguments.ql

@@ -23,5 +23,6 @@ where
     or
     complexArgumentPassedToRealParameter(fc, f, p)
   )
-select fc, "Argument $@ in call to $@ is incompatible with parameter $@.",
-  fc.getArgument(p.getIndex()) as arg, arg.toString(), f, f.toString(), p, p.getTypedName()
+select fc,
+  "Argument $@ in call to " + f.toString() + " is incompatible with parameter " + p.getTypedName() +
+    ".", fc.getArgument(p.getIndex()) as arg, arg.toString()

c/cert/test/rules/EXP37-C/DoNotCallFunctionsWithIncompatibleArguments.expected

@@ -1,3 +1,3 @@
-| test.c:83:12:83:16 | call to atan2 | Argument $@ in call to $@ is incompatible with parameter $@. | test.c:83:18:83:18 | c | c | file:///Users/kraiouchkine/codeql-coding-standards/c/common/test/includes/standard-library/math.h:155:13:155:17 | atan2 | atan2 | file:///Users/kraiouchkine/codeql-coding-standards/c/common/test/includes/standard-library/math.h:155:19:155:24 | (unnamed parameter 0) | double (unnamed parameter 0) |
-| test.c:93:3:93:12 | call to test_func1 | Argument $@ in call to $@ is incompatible with parameter $@. | test.c:93:14:93:15 | p1 | p1 | test2.c:1:6:1:15 | test_func1 | test_func1 | test2.c:1:23:1:24 | p1 | short p1 |
-| test.c:94:3:94:12 | call to test_func1 | Argument $@ in call to $@ is incompatible with parameter $@. | test.c:94:14:94:15 | p2 | p2 | test2.c:1:6:1:15 | test_func1 | test_func1 | test2.c:1:23:1:24 | p1 | short p1 |
+| test.c:83:12:83:16 | call to atan2 | Argument $@ in call to atan2 is incompatible with parameter double (unnamed parameter 0). | test.c:83:18:83:18 | c | c |
+| test.c:93:3:93:12 | call to test_func1 | Argument $@ in call to test_func1 is incompatible with parameter short p1. | test.c:93:14:93:15 | p1 | p1 |
+| test.c:94:3:94:12 | call to test_func1 | Argument $@ in call to test_func1 is incompatible with parameter short p1. | test.c:94:14:94:15 | p2 | p2 |