|
From: <sv...@va...> - 2005-05-12 18:02:52
|
Author: sewardj
Date: 2005-05-12 19:02:50 +0100 (Thu, 12 May 2005)
New Revision: 3685
Modified:
trunk/memcheck/tests/leakotron.c
Log:
64-bit fix.
Modified: trunk/memcheck/tests/leakotron.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/tests/leakotron.c 2005-05-12 18:02:01 UTC (rev 3684)
+++ trunk/memcheck/tests/leakotron.c 2005-05-12 18:02:50 UTC (rev 3685)
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
+#include <assert.h>
#include "../memcheck.h"
=20
/*=20
@@ -94,9 +95,13 @@
int main()
{
int i;
- int base_definite, base_dubious, base_reachable, base_suppressed;
- int definite, dubious, reachable, suppressed, total;
+ long base_definite, base_dubious, base_reachable, base_suppressed;
+ long definite, dubious, reachable, suppressed;
+ int total;
=20
+ /* we require these longs to have same size as a machine word */
+ assert(sizeof(long) =3D=3D sizeof(void*));
+
/* get a baseline in case the runtime allocated some memory */
VALGRIND_DO_LEAK_CHECK;
base_definite =3D base_dubious =3D base_reachable =3D base_suppressed =3D=
0;
@@ -139,12 +144,12 @@
=20
if (0)
printf("leaks: definite %d, dubious %d, reachable %d, suppressed %d =3D=
%d\n",
- definite, dubious, reachable, suppressed, total);
+ (int)definite, (int)dubious, (int)reachable, (int)suppressed, t=
otal);
=20
if (reachable !=3D 0)
printf("FAILED: I freed everything, "
"but there's still %d bytes reachable\n",=20
- reachable);
+ (int)reachable);
else if (total !=3D bytes)
printf("FAILED: I count %d bytes, leakcheck says %d\n",
bytes, total);
|