merge from gcc

This commit is contained in:
DJ Delorie
2005-03-01 02:22:06 +00:00
parent c9dea48b1f
commit bac7199c79
2 changed files with 10 additions and 5 deletions

@ -1,3 +1,8 @@
2005-03-01 Ben Elliston <bje@au.ibm.com>
* hashtab.c (htab_find_slot_with_hash): Make function
documentation clearer.
2005-02-13 Jason Merrill <jason@redhat.com> 2005-02-13 Jason Merrill <jason@redhat.com>
* cp-demangle.c (__cxa_demangle): Change resolution of ambiguous * cp-demangle.c (__cxa_demangle): Change resolution of ambiguous

@ -621,11 +621,11 @@ htab_find (htab, element)
/* This function searches for a hash table slot containing an entry /* This function searches for a hash table slot containing an entry
equal to the given element. To delete an entry, call this with equal to the given element. To delete an entry, call this with
INSERT = 0, then call htab_clear_slot on the slot returned (possibly insert=NO_INSERT, then call htab_clear_slot on the slot returned
after doing some checks). To insert an entry, call this with (possibly after doing some checks). To insert an entry, call this
INSERT = 1, then write the value you want into the returned slot. with insert=INSERT, then write the value you want into the returned
When inserting an entry, NULL may be returned if memory allocation slot. When inserting an entry, NULL may be returned if memory
fails. */ allocation fails. */
PTR * PTR *
htab_find_slot_with_hash (htab, element, hash, insert) htab_find_slot_with_hash (htab, element, hash, insert)