cast-conv-ptr: warnings messages changed

Author: jayrm

tests/warnings/r/dos/ptr-callconv.txt

@@ -1,31 +1,31 @@
 no warnings:
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Calling convention mismatch
+	Calling convention mismatch in function pointer

tests/warnings/r/dos/ptr-const-result.txt

@@ -1,56 +1,56 @@
 no warnings:
 2 warnings:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 no warnings:
 2 warnings:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer
 2 warnings:
 	Suspicious pointer assignment
-	Return method mismatch
+	Return method mismatch in function pointer

tests/warnings/r/dos/ptr-dtype-param-byref.txt

@@ -56,10 +56,10 @@ pz =pw, no warning:
 pw =pz, no warning:
 ppsub =ppfi, 2 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 ppfi =ppsub, 2 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 byrefany =b, 1 warning:
 	Suspicious pointer assignment
 byrefany =ub, 1 warning:
@@ -1766,7 +1766,7 @@ psub =fwd2, 1 warning:
 	Suspicious pointer assignment
 psub =pfi, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 psub =pany, 1 warning:
 	Suspicious pointer assignment
 psub =pb, 1 warning:
@@ -1811,7 +1811,7 @@ psub =ppsub, 1 warning:
 	Suspicious pointer assignment
 psub =ppfi, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 pfi =byrefany, 1 warning:
 	Suspicious pointer assignment
 pfi =b, 1 warning:
@@ -1854,7 +1854,7 @@ pfi =fwd2, 1 warning:
 	Suspicious pointer assignment
 pfi =psub, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 pfi =pany, 1 warning:
 	Suspicious pointer assignment
 pfi =pb, 1 warning:
@@ -1897,7 +1897,7 @@ pfi =pdwf2, 1 warning:
 	Suspicious pointer assignment
 pfi =ppsub, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 pfi =ppfi, 1 warning:
 	Suspicious pointer assignment
 pany =byrefany, 1 warning:
@@ -3608,7 +3608,7 @@ ppsub =psub, 1 warning:
 	Suspicious pointer assignment
 ppsub =pfi, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 ppsub =pany, 1 warning:
 	Suspicious pointer assignment
 ppsub =pb, 1 warning:
@@ -3691,7 +3691,7 @@ ppfi =fwd2, 1 warning:
 	Suspicious pointer assignment
 ppfi =psub, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 ppfi =pfi, 1 warning:
 	Suspicious pointer assignment
 ppfi =pany, 1 warning:

tests/warnings/r/dos/ptr-dtype-param-byval.txt

@@ -46,10 +46,10 @@ pz =pw, no warning:
 pw =pz, no warning:
 ppsub =ppfi, 2 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 ppfi =ppsub, 2 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 b =sh, 1 warning:
 	Suspicious pointer assignment
 b =ush, 1 warning:
@@ -1186,7 +1186,7 @@ psub =udt2, 1 warning:
 	Suspicious pointer assignment
 psub =pfi, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 psub =pany, 1 warning:
 	Suspicious pointer assignment
 psub =pb, 1 warning:
@@ -1231,7 +1231,7 @@ psub =ppsub, 1 warning:
 	Suspicious pointer assignment
 psub =ppfi, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 pfi =b, 1 warning:
 	Suspicious pointer assignment
 pfi =ub, 1 warning:
@@ -1264,7 +1264,7 @@ pfi =udt2, 1 warning:
 	Suspicious pointer assignment
 pfi =psub, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 pfi =pany, 1 warning:
 	Suspicious pointer assignment
 pfi =pb, 1 warning:
@@ -1307,7 +1307,7 @@ pfi =pdwf2, 1 warning:
 	Suspicious pointer assignment
 pfi =ppsub, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 pfi =ppfi, 1 warning:
 	Suspicious pointer assignment
 pany =b, 1 warning:
@@ -2808,7 +2808,7 @@ ppsub =psub, 1 warning:
 	Suspicious pointer assignment
 ppsub =pfi, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 ppsub =pany, 1 warning:
 	Suspicious pointer assignment
 ppsub =pb, 1 warning:
@@ -2881,7 +2881,7 @@ ppfi =udt2, 1 warning:
 	Suspicious pointer assignment
 ppfi =psub, 1 warning:
 	Suspicious pointer assignment
-	Return type mismatch
+	Return type mismatch in function pointer
 ppfi =pfi, 1 warning:
 	Suspicious pointer assignment
 ppfi =pany, 1 warning: