merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 1d801adf38f9096129b42636e354f8731211fb02..fc8040bc1cca1d6769ec960832bcf0b325a8e351 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -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>
 
        * cp-demangle.c (__cxa_demangle): Change resolution of ambiguous

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