|
From: <sv...@va...> - 2005-08-23 16:10:42
|
Author: njn
Date: 2005-08-23 17:10:36 +0100 (Tue, 23 Aug 2005)
New Revision: 4476
Log:
Make "silly arg" message 64-bit clean.
Modified:
trunk/memcheck/mac_malloc_wrappers.c
Modified: trunk/memcheck/mac_malloc_wrappers.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/mac_malloc_wrappers.c 2005-08-23 15:45:33 UTC (rev 447=
5)
+++ trunk/memcheck/mac_malloc_wrappers.c 2005-08-23 16:10:36 UTC (rev 447=
6)
@@ -158,7 +158,15 @@
// assuming here that the size asked for is not greater than 2^31 byt=
es
// (for 32-bit platforms) or 2^63 bytes (for 64-bit platforms).
if ((SSizeT)sizeB < 0) {
- VG_(message)(Vg_UserMsg, "Warning: silly arg (%d) to %s()", sizeB,=
fn );
+#if VG_WORDSIZE =3D=3D 4
+ VG_(message)(Vg_UserMsg, "Warning: silly arg (%d) to %s()",
+ (Int)sizeB, fn );
+#elif VG_WORDSIZE =3D=3D 8
+ VG_(message)(Vg_UserMsg, "Warning: silly arg (%lld) to %s()",
+ (Long)sizeB, fn );
+#else
+# error Unexpected word size
+#endif
return True;
}
return False;
@@ -167,8 +175,15 @@
static Bool complain_about_silly_args2(SizeT n, SizeT sizeB)
{
if ((SSizeT)n < 0 || (SSizeT)sizeB < 0) {
+#if VG_WORDSIZE =3D=3D 4
VG_(message)(Vg_UserMsg, "Warning: silly args (%d,%d) to calloc()"=
,
- n, sizeB);
+ (Int)n, (Int)sizeB);
+#elif VG_WORDSIZE =3D=3D 8
+ VG_(message)(Vg_UserMsg, "Warning: silly args (%lld,%lld) to callo=
c()",
+ (Long)n, (Long)sizeB);
+#else
+# error Unexpected word size
+#endif
return True;
}
return False;
|