diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-07-24 10:44:53 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-07-24 10:44:53 +0000 |
| commit | 405550bf78acc8ce8885e4b30986035533d08267 (patch) | |
| tree | 3da05c874d6fc47194f7bf47d1ad3a117e314406 /locale | |
| parent | e155c80135043ce7582a5cb8623142c8ca14cbe5 (diff) | |
| download | glibc-405550bf78acc8ce8885e4b30986035533d08267.tar glibc-405550bf78acc8ce8885e4b30986035533d08267.tar.gz glibc-405550bf78acc8ce8885e4b30986035533d08267.tar.bz2 glibc-405550bf78acc8ce8885e4b30986035533d08267.zip | |
Update.
2002-07-24 Ulrich Drepper <drepper@redhat.com>
* locale/hashval.h: Make more self-containedby defining LONG_BITS.
* locale/programs/simple-hash.c: Remove LONG_BITS definition.
* locale/programs/locarchive.c (add_locale_to_archive): Correct
test to detect duplicate locales.
* libio/fileops.c (_IO_new_file_seekoff): Fail if relative
position would be before beginning of file.
(_IO_file_seekoff_mmap): Likewise.
* libio/Makefile (tests): Add bug-fseek.
* libio/bug-fseek.c: New file.
* intl/explodename.c: Remove support for CEN-style locale variables.
It was never used and shouldn't be since it's not portable.
* intl/finddomain.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/loadinfo.h: Likewise.
* locale/findlocale.c: Likewise.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/hashval.h | 10 | ||||
| -rw-r--r-- | locale/programs/locarchive.c | 2 | ||||
| -rw-r--r-- | locale/programs/simple-hash.c | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/locale/hashval.h b/locale/hashval.h index 15ec1244cf..e35957dde3 100644 --- a/locale/hashval.h +++ b/locale/hashval.h @@ -18,7 +18,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -unsigned long +#ifndef LONGBITS +# define LONGBITS (sizeof (long int) * BITSPERBYTE) +#endif + +unsigned long int compute_hashval (const void *key, size_t keylen); + +unsigned long int compute_hashval (key, keylen) const void *key; size_t keylen; @@ -37,5 +43,5 @@ compute_hashval (key, keylen) hval = (hval << 9) | (hval >> (LONGBITS - 9)); hval += (unsigned long int) *(((char *) key) + cnt++); } - return hval != 0 ? hval : ~((unsigned long) 0); + return hval != 0 ? hval : ~((unsigned long int) 0); } diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index 9ef373a2e5..de026b2a74 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -531,7 +531,7 @@ add_locale_to_archive (ah, name, data, replace) (char *) ah->addr + namehashtab[idx].name_offset) == 0) { /* Found the entry. */ - if (! replace) + if (namehashtab[idx].locrec_offset != 0 && ! replace) { if (! be_quiet) error (0, 0, _("locale '%s' already exists"), name); diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c index b52b5593d0..c319068677 100644 --- a/locale/programs/simple-hash.c +++ b/locale/programs/simple-hash.c @@ -46,10 +46,6 @@ # define BITSPERBYTE 8 #endif -#ifndef LONGBITS -# define LONGBITS (sizeof (long) * BITSPERBYTE) -#endif - #ifndef bcopy # define bcopy(s, d, n) memcpy ((d), (s), (n)) #endif |