use bfd memory allcation routines

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 44733602a880241a0f46ba468df0e3d72e197044..4f981b03ae422ef87dd0c6703e54b05520d9e95b 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-06  Nick Clifton  <nickc@cygnus.com>
+
+       * elflink.h (elf_gc_record_vtentry): Use bfd_zmalloc and
+       bfd_realloc instead of calloc and realloc.
+
 1999-09-04  Steve Chamberlain  <sac@pobox.com>
 
        * cpu-pj.c: New file.

diff --git a/bfd/elflink.h b/bfd/elflink.h
index e9ba45adffb8b03354ea0cb2068c17fc76bd92c1..43a44dace023876139ca6a7702bd98c0f6b1ebbf 100644 (file)
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -6419,30 +6419,31 @@ elf_gc_record_vtentry (abfd, sec, h, addend)
 
       /* Allocate one extra entry for use as a "done" flag for the
         consolidation pass.  */
-      bytes = (size / FILE_ALIGN + 1) * sizeof(boolean);
+      bytes = (size / FILE_ALIGN + 1) * sizeof (boolean);
 
       if (ptr)
        {
-         size_t oldbytes;
-
-         ptr = realloc (ptr-1, bytes);
-         if (ptr == NULL)
-           return false;
+         ptr = bfd_realloc (ptr - 1, bytes);
+         
+         if (ptr != NULL)
+           {
+             size_t oldbytes;
 
-         oldbytes = (h->vtable_entries_size/FILE_ALIGN + 1) * sizeof(boolean);
-         memset (((char *)ptr) + oldbytes, 0, bytes - oldbytes);
+             oldbytes = (h->vtable_entries_size/FILE_ALIGN + 1) * sizeof (boolean);
+             memset (((char *)ptr) + oldbytes, 0, bytes - oldbytes);
+           }
        }
       else
-       {
-         ptr = calloc (1, bytes);
-         if (ptr == NULL)
-           return false;
-       }
+       ptr = bfd_zmalloc (bytes);
 
+      if (ptr == NULL)
+       return false;
+      
       /* And arrange for that done flag to be at index -1.  */
-      h->vtable_entries_used = ptr+1;
+      h->vtable_entries_used = ptr + 1;
       h->vtable_entries_size = size;
     }
+  
   h->vtable_entries_used[addend / FILE_ALIGN] = true;
 
   return true;