From: Nick Clifton <nickc@redhat.com>
Date: Mon, 10 Jun 2002 10:18:33 +0000 (+0000)
Subject: Use htab_create_alloc with calloc, not htab_alloc.
X-Git-Tag: binutils-2_13-branchpoint~448
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebe3e2d199ce2c10fd27188855194170edd098cf;p=external%2Fbinutils.git

Use htab_create_alloc with calloc, not htab_alloc.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d7b6138..1dfc78d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-10  Geoffrey Keating  <geoffk@redhat.com>
+
+	* merge.c (merge_strings): Use htab_create_alloc with calloc, not
+	htab_alloc.
+	* elf-strtab.c (_bfd_elf_strtab_finalize): Likewise.
+
 2002-06-08  H.J. Lu <hjl@gnu.org>
 
 	* elf.c (copy_private_bfd_data): Don't cast to bfd_size_type to
diff --git a/bfd/elf-strtab.c b/bfd/elf-strtab.c
index e2568a3..7a993c2 100644
--- a/bfd/elf-strtab.c
+++ b/bfd/elf-strtab.c
@@ -352,7 +352,7 @@ _bfd_elf_strtab_finalize (tab)
 
   qsort (array, size, sizeof (struct elf_strtab_hash_entry *), cmplengthentry);
 
-  last4tab = htab_create (size * 4, NULL, last4_eq, NULL);
+  last4tab = htab_create_alloc (size * 4, NULL, last4_eq, NULL, calloc, free);
   if (last4tab == NULL)
     goto alloc_failure;
 
diff --git a/bfd/merge.c b/bfd/merge.c
index 9af93b0..866b69c 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -652,8 +652,10 @@ merge_strings (sinfo)
   qsort (array, (size_t) sinfo->htab->size,
 	 sizeof (struct sec_merge_hash_entry *), cmplengthentry);
 
-  last4tab = htab_create ((size_t) sinfo->htab->size * 4, NULL, last4_eq, NULL);
-  lasttab = htab_create ((size_t) sinfo->htab->size * 4, NULL, last_eq, NULL);
+  last4tab = htab_create_alloc ((size_t) sinfo->htab->size * 4, 
+				NULL, last4_eq, NULL, calloc, free);
+  lasttab = htab_create_alloc ((size_t) sinfo->htab->size * 4, 
+			       NULL, last_eq, NULL, calloc, free);
   if (lasttab == NULL || last4tab == NULL)
     goto alloc_failure;