summaryrefslogtreecommitdiff
path: root/bfd/merge.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2007-09-19 12:08:34 +0000
committerAlan Modra <amodra@bigpond.net.au>2007-09-19 12:08:34 +0000
commit8069ec8aeb62eb1c247f8b49b622d9fe41deb7a8 (patch)
treea59ce0cbad66e3d8e4e44c6705341359b46e45f0 /bfd/merge.c
parent70db70bc514c9eb1a3ebe91641c407c453c7499a (diff)
downloadbinutils-redhat-8069ec8aeb62eb1c247f8b49b622d9fe41deb7a8.tar.gz
* bfd-in.h (bfd_hash_insert): Declare.
* bfd-in2.h: Regenerate. * hash.c (bfd_hash_insert): New function. Split out from.. (bfd_hash_lookup): ..here. * merge.c (sec_merge_hash_lookup): Use bfd_hash_insert.
Diffstat (limited to 'bfd/merge.c')
-rw-r--r--bfd/merge.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/bfd/merge.c b/bfd/merge.c
index 2e805c770e..32994c3cba 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -220,16 +220,11 @@ sec_merge_hash_lookup (struct sec_merge_hash *table, const char *string,
return NULL;
hashp = ((struct sec_merge_hash_entry *)
- sec_merge_hash_newfunc (NULL, &table->table, string));
+ bfd_hash_insert (&table->table, string, hash));
if (hashp == NULL)
return NULL;
- hashp->root.string = string;
- hashp->root.hash = hash;
hashp->len = len;
hashp->alignment = alignment;
- hashp->root.next = table->table.table[index];
- table->table.table[index] = (struct bfd_hash_entry *) hashp;
-
return hashp;
}