use bfd memory allcation routines

2 files changed, 20 insertions, 14 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4473360..4f981b0 100644
--- 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 e9ba45a..43a44da 100644
--- 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;