aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--locale/programs/locarchive.c3
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8154f91d8a..8e36b4de56 100644
--- 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 498321442f..967589f0a4 100644
--- 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;