From 1490e5e06f1dd716c7741e70e373ac1a236e24d9 Mon Sep 17 00:00:00 2001 From: dj Date: Tue, 13 Apr 2004 15:23:19 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 5 +++++ libiberty/hashtab.c | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 661ca4b45b..7da2d46d60 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2004-04-13 Jeff Law + + * hashtab.c (htab_remove_elt_with_hash): New function. + (htab_remove_elt): Implement in terms of htab_remove_elt_with_hash. + 2004-03-31 Richard Henderson * hashtab.c (htab_size): Move to top of file; mark inline. diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c index f7751664f0..2639428df9 100644 --- a/libiberty/hashtab.c +++ b/libiberty/hashtab.c @@ -600,17 +600,31 @@ htab_find_slot (htab, element, insert) } /* This function deletes an element with the given value from hash + table (the hash is computed from the element). If there is no matching + element in the hash table, this function does nothing. */ + +void +htab_remove_elt (htab, element) + htab_t htab; + PTR element; +{ + htab_remove_elt_with_hash (htab, element, (*htab->hash_f) (element)); +} + + +/* This function deletes an element with the given value from hash table. If there is no matching element in the hash table, this function does nothing. */ void -htab_remove_elt (htab, element) +htab_remove_elt_with_hash (htab, element, hash) htab_t htab; PTR element; + hashval_t hash; { PTR *slot; - slot = htab_find_slot (htab, element, NO_INSERT); + slot = htab_find_slot_with_hash (htab, element, hash, NO_INSERT); if (*slot == EMPTY_ENTRY) return; -- 2.11.0