Remove more now-unnecessary casts, thanks to the recent VgHashTable changes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4409

diff --git a/memcheck/mac_malloc_wrappers.c b/memcheck/mac_malloc_wrappers.c
index 92a29477b372ed93ec8d675e5f731eb5baaed794..96365eea644f131f6f94a5ce0f7adab9db35f225 100644 (file)
--- a/memcheck/mac_malloc_wrappers.c
+++ b/memcheck/mac_malloc_wrappers.c
@@ -463,7 +463,7 @@ void MAC_(destroy_mempool)(Addr pool)
 {
    MAC_Mempool* mp;
 
-   mp = (MAC_Mempool*)VG_(HT_remove) ( MAC_(mempool_list), (UWord)pool );
+   mp = VG_(HT_remove) ( MAC_(mempool_list), (UWord)pool );
 
    if (mp == NULL) {
       ThreadId tid = VG_(get_running_tid)();
@@ -481,7 +481,7 @@ void MAC_(mempool_alloc)(ThreadId tid, Addr pool, Addr addr, SizeT size)
 {
    MAC_Mempool*  mp;
 
-   mp = (MAC_Mempool*)VG_(HT_lookup) ( MAC_(mempool_list), (UWord)pool );
+   mp = VG_(HT_lookup) ( MAC_(mempool_list), (UWord)pool );
 
    if (mp == NULL) {
       MAC_(record_illegal_mempool_error) ( tid, pool );
@@ -498,7 +498,7 @@ void MAC_(mempool_free)(Addr pool, Addr addr)
    MAC_Chunk*    mc;
    ThreadId      tid = VG_(get_running_tid)();
 
-   mp = (MAC_Mempool*)VG_(HT_lookup)(MAC_(mempool_list), (UWord)pool);
+   mp = VG_(HT_lookup)(MAC_(mempool_list), (UWord)pool);
    if (mp == NULL) {
       MAC_(record_illegal_mempool_error)(tid, pool);
       return;

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index afcd138f890ad0d92fa9be847d7ab06c3fdd86a2..767ffde2a2b520b4ccca15069dc79b0320c76f35 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -2328,8 +2328,8 @@ static Bool client_perm_maybe_describe( Addr a, AddrInfo* ai )
       // 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 = (MAC_Mempool*)VG_(HT_lookup)(MAC_(mempool_list),
-                                                        (UWord)cgbs[i].start);
+         MAC_Mempool* mp = VG_(HT_lookup)(MAC_(mempool_list),
+                                          (UWord)cgbs[i].start);
          if(mp != NULL) {
             if(mp->chunks != NULL) {
                MAC_Chunk *mc;