From: Nicholas Nethercote <njn@valgrind.org>
Date: Sun, 14 Aug 2005 18:32:16 +0000 (+0000)
Subject: Remove more now-unnecessary casts, thanks to the recent VgHashTable changes.
X-Git-Tag: svn/VALGRIND_3_1_0~609
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7062ca6bc7bf0ff99d2f5547f7e5e25232c61f92;p=thirdparty%2Fvalgrind.git

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 92a29477b3..96365eea64 100644
--- 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 afcd138f89..767ffde2a2 100644
--- 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;