|
From: <sv...@va...> - 2005-10-13 15:29:54
|
Author: tom
Date: 2005-10-13 16:29:39 +0100 (Thu, 13 Oct 2005)
New Revision: 4915
Log:
We can print native word sized values sensibly now...
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-10-13 12:41:09 UTC (rev 491=
4)
+++ trunk/memcheck/mac_malloc_wrappers.c 2005-10-13 15:29:39 UTC (rev 491=
5)
@@ -158,15 +158,8 @@
// 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) {
-#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
+ VG_(message)(Vg_UserMsg, "Warning: silly arg (%ld) to %s()",
+ (SSizeT)sizeB, fn );
return True;
}
return False;
@@ -175,15 +168,8 @@
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()"=
,
- (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
+ VG_(message)(Vg_UserMsg, "Warning: silly args (%ld,%ld) to calloc(=
)",
+ (SSizeT)n, (SSizeT)sizeB);
return True;
}
return False;
|