2002-08-28 Jakub Jelinek <jakub@redhat.com>

        * locale/programs/locarchive.c (insert_name): Suppress warnings about
  	hash collisions if be_quiet.

	* locale/locale.h (__newlocale, __duplocale, __freelocale,
	__uselocale): Don't declare these any more.
	* include/locale.h (__uselocale): Declare here instead, using __typeof.

diff --git a/ChangeLog b/ChangeLog
index 8154f91..8e36b4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
+2002-08-28  Jakub Jelinek  <jakub@redhat.com>
+
+        * locale/programs/locarchive.c (insert_name): Suppress warnings about
+       hash collisions if be_quiet.
+
 2002-08-27  Roland McGrath  <roland@redhat.com>
 
+       * locale/locale.h (__newlocale, __duplocale, __freelocale,
+       __uselocale): Don't declare these any more.
+       * include/locale.h (__uselocale): Declare here instead, using __typeof.
+
        * sysdeps/unix/readdir.c: If getdents fails with ENOENT, restore errno
        and treat it as an EOF return.
        * sysdeps/unix/readdir_r.c: Likewise.

diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index 4983214..967589f 100644 (file)
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -547,13 +547,12 @@ insert_name (struct locarhandle *ah,
          break;
        }
 
-      if (namehashtab[idx].hashval == hval)
+      if (namehashtab[idx].hashval == hval && ! be_quiet)
        {
          error (0, 0, "hash collision (%u) %s, %s",
                 hval, name, (char *) ah->addr + namehashtab[idx].name_offset);
        }
 
-
       /* Remember the first place we can insert the new entry.  */
       if (namehashtab[idx].locrec_offset == 0 && insert_idx == -1)
        insert_idx = idx;