lots of little wibbles

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

diff --git a/coregrind/m_oset.c b/coregrind/m_oset.c
index c7c0738d291781d0ae344d2aec305972a32b8aff..f3298d29b61e2a8a4c12e1c55899d83da569f696 100644 (file)
--- a/coregrind/m_oset.c
+++ b/coregrind/m_oset.c
@@ -724,4 +724,3 @@ static void OSet_Print( AvlTree* t, const HChar *where, Char*(*strElem)(void *)
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/
-

diff --git a/massif/ms_main.c b/massif/ms_main.c
index e0ebe0a69ba5d501b309b5bf7bfd7a364eae8c6f..c44e2a11c71e259a7ec43d89d170ca37d30239fb 100644 (file)
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -711,7 +711,7 @@ void die_block ( void* p, Bool custom_free )
    n_frees++;
 
    // Remove HP_Chunk from malloc_list
-   hc = (HP_Chunk*)VG_(HT_remove)(malloc_list, (UWord)p);
+   hc = VG_(HT_remove)(malloc_list, (UWord)p);
    if (NULL == hc)
       return;   // must have been a bogus free()
    tl_assert(n_heap_blocks > 0);
@@ -783,7 +783,7 @@ static void* ms_realloc ( ThreadId tid, void* p_old, SizeT new_size )
    VGP_PUSHCC(VgpCliMalloc);
 
    // First try and find the block.
-   hc = (HP_Chunk*)VG_(HT_remove)(malloc_list, (UWord)p_old);
+   hc = VG_(HT_remove)(malloc_list, (UWord)p_old);
    if (hc == NULL) {
       VGP_POPCC(VgpCliMalloc);
       return NULL;   // must have been a bogus realloc()

diff --git a/memcheck/mac_malloc_wrappers.c b/memcheck/mac_malloc_wrappers.c
index 8420d28ec47bbe28a98cbee539bad0212d57cd11..d72ec22067f7385717e58dc04923211e4afa7dc6 100644 (file)
--- a/memcheck/mac_malloc_wrappers.c
+++ b/memcheck/mac_malloc_wrappers.c
@@ -67,12 +67,10 @@ Bool (*MAC_(check_noaccess))( Addr a, SizeT len, Addr* bad_addr ) = NULL;
 /*--- Tracking malloc'd and free'd blocks                  ---*/
 /*------------------------------------------------------------*/
 
-/* Record malloc'd blocks.  Nb: Addrcheck and Memcheck construct this
-   separately in their respective initialisation functions. */
+/* Record malloc'd blocks. */
 VgHashTable MAC_(malloc_list) = NULL;
 
-/* Memory pools.  Nb: Addrcheck and Memcheck construct this separately
-   in their respective initialisation functions. */
+/* Memory pools. */
 VgHashTable MAC_(mempool_list) = NULL;
    
 /* Records blocks after freeing. */
@@ -84,8 +82,6 @@ static Int        freed_list_volume = 0;
    some of the oldest blocks in the queue at the same time. */
 static void add_to_freed_queue ( MAC_Chunk* mc )
 {
-   MAC_Chunk* mc1;
-
    /* Put it at the end of the freed list */
    if (freed_list_end == NULL) {
       tl_assert(freed_list_start == NULL);
@@ -103,6 +99,8 @@ static void add_to_freed_queue ( MAC_Chunk* mc )
       volume below vg_clo_freelist_vol. */
 
    while (freed_list_volume > MAC_(clo_freelist_vol)) {
+      MAC_Chunk* mc1;
+
       tl_assert(freed_list_start != NULL);
       tl_assert(freed_list_end != NULL);
 
@@ -140,11 +138,10 @@ MAC_Chunk* create_MAC_Chunk ( ThreadId tid, Addr p, SizeT size,
    mc->allockind = kind;
    mc->where     = VG_(record_ExeContext)(tid);
 
-   /* Paranoia ... ensure this area is off-limits to the client, so
+   /* Paranoia ... ensure the MAC_Chunk is off-limits to the client, so
       the mc->data field isn't visible to the leak checker.  If memory
-      management is working correctly, anything pointer returned by
-      VG_(malloc) should be noaccess as far as the client is
-      concerned. */
+      management is working correctly, any pointer returned by VG_(malloc)
+      should be noaccess as far as the client is concerned. */
    if (!MAC_(check_noaccess)( (Addr)mc, sizeof(MAC_Chunk), NULL )) {
       VG_(tool_panic)("create_MAC_Chunk: shadow area is accessible");
    } 
@@ -296,20 +293,17 @@ void MAC_(handle_free) ( ThreadId tid, Addr p, UInt rzB, MAC_AllocKind kind )
 
    cmalloc_n_frees++;
 
-   mc = (MAC_Chunk*)VG_(HT_remove) ( MAC_(malloc_list), (UWord)p );
+   mc = VG_(HT_remove) ( MAC_(malloc_list), (UWord)p );
    if (mc == NULL) {
       MAC_(record_free_error) ( tid, p );
-      VGP_POPCC(VgpCliMalloc);
-      return;
-   }
-
-   /* check if its a matching free() / delete / delete [] */
-   if (kind != mc->allockind) {
-      MAC_(record_freemismatch_error) ( tid, p, mc );
+   } else {
+      /* check if its a matching free() / delete / delete [] */
+      if (kind != mc->allockind) {
+         MAC_(record_freemismatch_error) ( tid, p, mc );
+      }
+      die_and_free_mem ( tid, mc, rzB );
    }
 
-   die_and_free_mem ( tid, mc, rzB );
-
    VGP_POPCC(VgpCliMalloc);
 }
 
@@ -347,10 +341,10 @@ void* MAC_(realloc) ( ThreadId tid, void* p_old, SizeT new_size )
       return NULL;
 
    /* Remove the old block */
-   mc = (MAC_Chunk*)VG_(HT_remove) ( MAC_(malloc_list), (UWord)p_old );
+   mc = VG_(HT_remove) ( MAC_(malloc_list), (UWord)p_old );
    if (mc == NULL) {
       MAC_(record_free_error) ( tid, (Addr)p_old );
-      /* Perhaps we should return to the program regardless. */
+      /* We return to the program regardless. */
       VGP_POPCC(VgpCliMalloc);
       return NULL;
    }
@@ -416,13 +410,11 @@ void* MAC_(realloc) ( ThreadId tid, void* p_old, SizeT new_size )
 
 void MAC_(create_mempool)(Addr pool, UInt rzB, Bool is_zeroed)
 {
-   MAC_Mempool* mp;
-
-   mp            = VG_(malloc)(sizeof(MAC_Mempool));
-   mp->pool      = pool;
-   mp->rzB       = rzB;
-   mp->is_zeroed = is_zeroed;
-   mp->chunks    = VG_(HT_construct)( 3001 );  // prime, not so big
+   MAC_Mempool* mp = VG_(malloc)(sizeof(MAC_Mempool));
+   mp->pool        = pool;
+   mp->rzB         = rzB;
+   mp->is_zeroed   = is_zeroed;
+   mp->chunks      = VG_(HT_construct)( 3001 );  // prime, not so big
 
    /* Paranoia ... ensure this area is off-limits to the client, so
       the mp->data field isn't visible to the leak checker.  If memory
@@ -434,7 +426,6 @@ void MAC_(create_mempool)(Addr pool, UInt rzB, Bool is_zeroed)
    } 
 
    VG_(HT_add_node)( MAC_(mempool_list), mp );
-   
 }
 
 void MAC_(destroy_mempool)(Addr pool)
@@ -467,17 +458,14 @@ void MAC_(destroy_mempool)(Addr pool)
 
 void MAC_(mempool_alloc)(ThreadId tid, Addr pool, Addr addr, SizeT size)
 {
-   MAC_Mempool*  mp;
-
-   mp = VG_(HT_lookup) ( MAC_(mempool_list), (UWord)pool );
+   MAC_Mempool* mp = VG_(HT_lookup) ( MAC_(mempool_list), (UWord)pool );
 
    if (mp == NULL) {
       MAC_(record_illegal_mempool_error) ( tid, pool );
-      return;
+   } else {
+      MAC_(new_block)(tid, addr, size, /*ignored*/0, mp->rzB, mp->is_zeroed,
+                      MAC_AllocCustom, mp->chunks);
    }
-
-   MAC_(new_block)(tid, addr, size, /*ignored*/0, mp->rzB, mp->is_zeroed,
-                   MAC_AllocCustom, mp->chunks);
 }
 
 void MAC_(mempool_free)(Addr pool, Addr addr)
@@ -492,7 +480,7 @@ void MAC_(mempool_free)(Addr pool, Addr addr)
       return;
    }
 
-   mc = (MAC_Chunk*)VG_(HT_remove)(mp->chunks, (UWord)addr);
+   mc = VG_(HT_remove)(mp->chunks, (UWord)addr);
    if (mc == NULL) {
       MAC_(record_free_error)(tid, (Addr)addr);
       return;