OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Roland McGrath 2002-08-28 06:59:48 +00:00
parent a5cc88e5d0
commit 75261665f1
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 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 * sysdeps/unix/readdir.c: If getdents fails with ENOENT, restore errno
and treat it as an EOF return. and treat it as an EOF return.
* sysdeps/unix/readdir_r.c: Likewise. * sysdeps/unix/readdir_r.c: Likewise.

3
locale/programs/locarchive.c
View File

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