|
From: <sv...@va...> - 2005-08-14 18:32:26
|
Author: njn
Date: 2005-08-14 19:32:16 +0100 (Sun, 14 Aug 2005)
New Revision: 4409
Log:
Remove more now-unnecessary casts, thanks to the recent VgHashTable chang=
es.
Modified:
trunk/memcheck/mac_malloc_wrappers.c
trunk/memcheck/mc_main.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-14 18:24:44 UTC (rev 440=
8)
+++ trunk/memcheck/mac_malloc_wrappers.c 2005-08-14 18:32:16 UTC (rev 440=
9)
@@ -463,7 +463,7 @@
{
MAC_Mempool* mp;
=20
- mp =3D (MAC_Mempool*)VG_(HT_remove) ( MAC_(mempool_list), (UWord)pool=
);
+ mp =3D VG_(HT_remove) ( MAC_(mempool_list), (UWord)pool );
=20
if (mp =3D=3D NULL) {
ThreadId tid =3D VG_(get_running_tid)();
@@ -481,7 +481,7 @@
{
MAC_Mempool* mp;
=20
- mp =3D (MAC_Mempool*)VG_(HT_lookup) ( MAC_(mempool_list), (UWord)pool=
);
+ mp =3D VG_(HT_lookup) ( MAC_(mempool_list), (UWord)pool );
=20
if (mp =3D=3D NULL) {
MAC_(record_illegal_mempool_error) ( tid, pool );
@@ -498,7 +498,7 @@
MAC_Chunk* mc;
ThreadId tid =3D VG_(get_running_tid)();
=20
- mp =3D (MAC_Mempool*)VG_(HT_lookup)(MAC_(mempool_list), (UWord)pool);
+ mp =3D VG_(HT_lookup)(MAC_(mempool_list), (UWord)pool);
if (mp =3D=3D NULL) {
MAC_(record_illegal_mempool_error)(tid, pool);
return;
Modified: trunk/memcheck/mc_main.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/mc_main.c 2005-08-14 18:24:44 UTC (rev 4408)
+++ trunk/memcheck/mc_main.c 2005-08-14 18:32:16 UTC (rev 4409)
@@ -2328,8 +2328,8 @@
// Use zero as the redzone for client blocks.
if (VG_(addr_is_in_block)(a, cgbs[i].start, cgbs[i].size, 0)) {
/* OK - maybe it's a mempool, too? */
- MAC_Mempool* mp =3D (MAC_Mempool*)VG_(HT_lookup)(MAC_(mempool_l=
ist),
- (UWord)cgbs[i].s=
tart);
+ MAC_Mempool* mp =3D VG_(HT_lookup)(MAC_(mempool_list),
+ (UWord)cgbs[i].start);
if(mp !=3D NULL) {
if(mp->chunks !=3D NULL) {
MAC_Chunk *mc;
|