Use memcpy() instead of a loop.

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

diff --git a/massif/ms_main.c b/massif/ms_main.c
index 95d1566169395f77c3770d0cd39cac3436331510..03047d1d74f4e27db7eafb3990bef12e5bec922e 100644 (file)
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -798,7 +798,6 @@ static void* ms_realloc ( ThreadId tid, void* p_old, SizeT new_size )
 {
    HP_Chunk*    hc;
    HP_Chunk**   remove_handle;
-   Int          i;
    void*        p_new;
    SizeT        old_size;
    XPt         *old_where, *new_where;
@@ -822,10 +821,7 @@ static void* ms_realloc ( ThreadId tid, void* p_old, SizeT new_size )
    } else {
       // new size is bigger;  make new block, copy shared contents, free old
       p_new = VG_(cli_malloc)(VG_(clo_alignment), new_size);
-
-      for (i = 0; i < old_size; i++)
-         ((UChar*)p_new)[i] = ((UChar*)p_old)[i];
-
+      VG_(memcpy)(p_new, p_old, old_size);
       VG_(cli_free)(p_old);
    }
    

diff --git a/memcheck/mac_malloc_wrappers.c b/memcheck/mac_malloc_wrappers.c
index 003c6fa79bc308fb11cdfa319d404802e7d338a8..fd5578f36275975b6afffbe4a70e92966bfd8f6e 100644 (file)
--- a/memcheck/mac_malloc_wrappers.c
+++ b/memcheck/mac_malloc_wrappers.c
@@ -356,7 +356,6 @@ void* MAC_(realloc) ( ThreadId tid, void* p, SizeT new_size )
 {
    MAC_Chunk  *mc;
    MAC_Chunk **prev_chunks_next_ptr;
-   UInt        i;
 
    VGP_PUSHCC(VgpCliMalloc);
 
@@ -414,8 +413,7 @@ void* MAC_(realloc) ( ThreadId tid, void* p, SizeT new_size )
       MAC_(ban_mem_heap) ( p_new+new_size, MAC_MALLOC_REDZONE_SZB );
 
       /* Copy from old to new */
-      for (i = 0; i < mc->size; i++)
-         ((UChar*)p_new)[i] = ((UChar*)p)[i];
+      VG_(memcpy)((void*)p_new, p, mc->size);
 
       /* Free old memory */
       die_and_free_mem ( tid, mc, prev_chunks_next_ptr, MAC_MALLOC_REDZONE_SZB );