Refine analysis messages

Author: jeongsoolee09

c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql

@@ -17,7 +17,7 @@ import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 import semmle.code.cpp.rangeanalysis.RangeAnalysisUtils
 
 class CtypeFunction extends Function {
-  CtypeFunction() { this.getADeclaration().getAFile().(HeaderFile).getShortName() = "_ctype" }
+  CtypeFunction() { this.getADeclaration().getAFile().(HeaderFile).getBaseName() = "ctype.h" }
 }
 
 from FunctionCall ctypeCall
@@ -38,5 +38,5 @@ where
     )
   )
 select ctypeCall,
-  "The <ctype.h> function $@ accepts an argument $@ that is not unsigned char nor an EOF.",
-  ctypeCall, ctypeCall.getTarget(), ctypeCall.getAnArgument(), ctypeCall.getAnArgument().toString()
+  "The <ctype.h> function " + ctypeCall + " accepts an argument " +
+    ctypeCall.getAnArgument().toString() + " that is not an unsigned char nor an EOF."

c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql

@@ -22,18 +22,6 @@ class MemCmpMoveCpy extends Function {
   }
 }
 
-predicate memfunArgTypes(FunctionCall fc, Type dstType, Type srcType) {
-  (
-    fc.getArgument(0).getUnspecifiedType() instanceof PointerType and
-    fc.getArgument(1).getUnspecifiedType() instanceof PointerType
-    or
-    fc.getArgument(0).getUnspecifiedType() instanceof ArrayType and
-    fc.getArgument(1).getUnspecifiedType() instanceof ArrayType
-  ) and
-  dstType = fc.getArgument(0).getUnspecifiedType() and
-  srcType = fc.getArgument(1).getUnspecifiedType()
-}
-
 from FunctionCall fc
 where
   not isExcluded(fc,
@@ -50,4 +38,7 @@ where
     ) and
     dstType = srcType
   )
-select fc, fc.getArgument(0).getUnspecifiedType(), fc.getArgument(1).getUnspecifiedType()
+select fc,
+  "The dest type " + fc.getArgument(0).getUnspecifiedType() + " and src type " +
+    fc.getArgument(1).getUnspecifiedType() + " of function " + fc.getTarget() +
+    " are not compatible."

c/misra/test/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.expected

@@ -1 +1,2 @@
-| test.c:15:12:15:22 | call to islower | test.c:15:20:15:21 | c3 |
+| test.c:15:12:15:22 | call to islower | The <ctype.h> function call to islower accepts an argument c3 that is not an unsigned char nor an EOF. |
+| test.c:20:12:20:22 | call to isdigit | The <ctype.h> function call to isdigit accepts an argument c4 that is not an unsigned char nor an EOF. |

c/misra/test/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.expected

@@ -1,3 +1,3 @@
-| test.c:10:3:10:8 | call to memcpy | file://:0:0:0:0 | int * | file://:0:0:0:0 | int * |
-| test.c:14:3:14:9 | call to memmove | file://:0:0:0:0 | char[7] | file://:0:0:0:0 | char[7] |
-| test.c:22:3:22:8 | call to memcmp | file://:0:0:0:0 | char[7] | file://:0:0:0:0 | char[7] |
+| test.c:10:3:10:8 | call to memcpy | The dest type int * and src type int * of function memcpy are not compatible. |
+| test.c:14:3:14:9 | call to memmove | The dest type char[7] and src type char[7] of function memmove are not compatible. |
+| test.c:22:3:22:8 | call to memcmp | The dest type char[7] and src type char[7] of function memcmp are not compatible. |