aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2002-06-10 10:18:33 +0000
committerNick Clifton <nickc@redhat.com>2002-06-10 10:18:33 +0000
commitebe3e2d199ce2c10fd27188855194170edd098cf (patch)
tree54f8ee1ba92816afae2d62538d29add6b7b74bbe /bfd
parentb09b19f78632576b344720f8c7238b584f74d0a0 (diff)
downloadgdb-ebe3e2d199ce2c10fd27188855194170edd098cf.zip
gdb-ebe3e2d199ce2c10fd27188855194170edd098cf.tar.gz
gdb-ebe3e2d199ce2c10fd27188855194170edd098cf.tar.bz2
Use htab_create_alloc with calloc, not htab_alloc.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf-strtab.c2
-rw-r--r--bfd/merge.c6
3 files changed, 11 insertions, 3 deletions
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;