diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-10-31 02:57:12 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-10-31 02:57:12 +0000 |
commit | ba1ffaa1c6989873b57edc84491bfd1308b2190d (patch) | |
tree | 77274c1136f21a58e60397fdd62ad03846bc5888 /locale/programs/ld-collate.c | |
parent | f0f4432f46882d22f61a89f4130a697313f53901 (diff) | |
download | glibc-ba1ffaa1c6989873b57edc84491bfd1308b2190d.tar.gz glibc-ba1ffaa1c6989873b57edc84491bfd1308b2190d.tar.xz glibc-ba1ffaa1c6989873b57edc84491bfd1308b2190d.zip |
update from main archive 961030 cvs/libc-961031
Thu Oct 31 00:01:39 1996 Ulrich Drepper <drepper@cygnus.com> * signal/Makefile (routines): Add sigwait. * signal/signal.h: Add prototype for sigwait. * sysdeps/posix/sigwait.c: New file. Implementation of sigwait function from POSIX.1c. * sysdeps/stub/sigwait.c: New file. Stub version of sigwait. Wed Oct 30 02:01:17 1996 Richard Henderson <rth@tamu.edu> * sunrpc/xdr_float.c (xdr_float): Handle sizeof(float)!=sizeof(long), but don't bother going farther than sizeof(float)==sizeof(int). (xdr_double): Handle little-endian machines! Handle sizeof(double) != 2*sizeof(long), though again don't bother with more than int. Thu Oct 29 16:09:42 1996 Craig Metz <cmetz@inner.net> * sysdeps/posix/getaddrinfo.c: Use buffer limits for inet_ntop function. Tue Oct 29 12:37:22 1996 Ulrich Drepper <drepper@cygnus.com> * Makerules: Create symbolic links for linking in $(libdir). (make-link): Use absolute path for destination if this is not in the same directory. * elf/rtld.c (dl_main): When verifying don't check the name of the dynamic linker. * shlib-versions: Change entries for Hurd specific libs from *-*-gnu* to *-*-gnu?* so that i586-pc-linux-gnu does not match these entries. * assert/assert.h: Reformat copyright. Change reference to ANSI into reference to ISO C. * ctype/ctype.h: Likewise. * errno.h: Likewise. * limits.h: Likewise. * math/math.h: Likewise. * setjmp/setjmp.h: Likewise. * stdio/stdio.h: Likewise. * libio/stdio.h: Likewise. * stdlib/stdlib.h: Likewise. * string/string.h: Likewise. * time/time.h: Likewise. * string/argz.h: Use __const is definitions. * elf/dlfcn.h: Use __const and __P. Reformat copyright. * misc/err.h: Likewise. * wctype/wctype.h (wctrans_t): Use __const instead of const. * Makeconfig ($(common-objpfx)soversions.mk): Generate list of sonames for versioned libraries. * Makefile: Remove code to generate libc-version.h. Generate gnu/lib-names.h with info from soversions.mk. * features.h: Define __GLIBC__ and __GLIBC_MINOR__. * dirent/tst-seekdir.c: Initialize save3. * grp/testgrp.c: Initialize my_group. * grp/fgetgrent_r.c: Change interface to follow POSIX.1c. * grp/grp.h: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/pwd.h: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/sgetspent.c: Likewise. * shadow/sgetspent_r.c: Likewise. * grp/fgetgrent.c: Adapt for change in interface of fgetgrent_r. * pwd/fgetpwent.c: Likewise, for fgetpwent_r.c. * shadow/fgetspent.c: Likewise, for fgetpwent_r.c. * resolv/netdb.h: Adapt prototypes for reentrant functions to follow POSIX.1c. * sunrpc/rpc/netdb.h: Likewise, * shadow/shadow.h: Likewise. * inet/getnetgrent_r.c: Follow change in pwd/grp function interface. * sysdeps/unix/getlogin_r.c: Return ERANGE when buffer is too small. * inet/herrno.c: Don't define __h_errno. Only h_errno otherwise the ELF aliasing creates strange situations. * sysdeps/unix/sysv/linux/errnos.H: Define __set_errno as inline function. * sysdeps/unix/sysv/linux/i386/sysdep.S: Don't define __errno. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. * libio/libio.h: Don't declare _IO_flockfile and _IO_funlockfile weak. * locale/programs/charmap.c: Add casts to prevent warnings. * locale/programs/linereader.h: Likewise. * locale/programs/ld-collate.c: Likewise. * locale/programs/stringtrans.c: Likewise. Change types for various variables to prevent warnings. * locale/programs/ld-ctype.c: Likewise. * locale/programs/linereader.h (lr_ungetc): Likewise. * locale/programs/charset.h (struct charset): Use `unsigned int' as type for width_default. * posix/regex.c: Change type of `this_reg' variables. * stdio-common/Makefile: Use -Wno-format for tstdiomisc.c. * stdio-common/bug5.c: De-ANSI-fy. Use correct types for variables. * stdio-common/printf_fp.c: Initialize to_shift. * stdio-common/test_rdwr.c: Add cast. * stdio-common/vfprintf.c: Add casts and use correct types to prevent warnings. * stdio-common/vfscanf.c: Initialize str and strptr. * sysdeps/libm-ieee754/e_jnf.c: Use correct types to prevent warnings. * sysdeps/libm-ieee754/e_pow.c: Likewise. * sysdeps/libm-ieee754/e_powf.c: Likewise. * sysdeps/libm-ieee754/e_rem_pio2f.c: Likewise. * time/test-tz.c: Likewise. * manual/creature.texi: Document _REENTRANT and _THREAD_SAFE. * manual/libc.texinfo: Prevent makeinfo failure by avoiding libc.cp index. This must be fixed. * manual/nss.texi: Adapt for correct POSIX.1c interface of reentrant functions. * manual/users.texi: Document netgroup functions. * po/es.po: Updated. * po/fr.po: Updated. * posix/fnmatch.c: Change to match libit version. * posix/unistd.h: Change prototype for ttyname_r to match POSIX.1c. * sysdep/posix/ttyname_r.c: Likewise. * stdlib/atexit.h (__new_exitfn): Add internal locking. * stdlib/exit.c: De-ANSI-fy. Handle new ef_us value for flavor. * stdlib/exit.h: De-ANSI-fy. Define new ef_us value for flavor. * stdlib/random.c (__srandom): Add internal locking. (__initstate): Likewise. (__setstate): Likewise. (__random): Likewise. Mon Oct 28 22:28:37 1996 NIIBE Yutaka <gniibe@mri.co.jp> * sysdeps/generic/crypt-entry.c (crypt_r): Use __set_errno. (crypt): Likewise. * resolv/gethnamaddr.c (gethostbyname2): Likewise. * sysdeps/generic/uname.c: Likewise. * sysdeps/posix/rename.c: Likewise. * sysdeps/stub/setrlimit.c: Likewise. * nss/nss_db/db-netgrp.c (_nss_db_setnetgrent): Fix typo. Sun Oct 27 11:12:50 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locale/programs/ld-collate.c (collate_order_elem): Fix format string. (collate_element_to): Cast field width argument to `int' for format string. (collate_symbol): Likewise. (collate_order_elem): Likewise. (collate_weight_bsymbol): Likewise. (collate_simple_weight): Likewise. * locale/programs/ld-time.c (STRARR_ELEM): Fix format string. * locale/programs/ld-ctype.c (ctype_class_newP): Add missing argument for format string. (ctype_map_newP): Likewise. (set_class_defaults): Fix format string. * locale/programs/localedef.c (construct_output_path): Putting an explicit \0 into the format string does not work, use %c. Sat Oct 26 20:38:36 1996 Richard Henderson <rth@tamu.edu> * Makerules: Install all shared libraries in $(slibdir). * login/Makefile: Build libutil.so in others pass after libc.so is created. * misc/mntent.h: Include <paths.h> for _PATH_MNTTAB & _PATH_MOUNTED. * string/stratcliff.c: Allocate 3 pages instead of one, then use mprotect so that we know that the adjacent pages are inaccessible. * resource/sys/resource.h: Move all structures and enums to ... * sysdeps/generic/resourcebits.h: ... here ... * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: ... and here. * sysdeps/unix/sysv/linux/alpha/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/i386/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/m68k/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/mips/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/resourcebits.h: New file. Use kernel header for RLIMIT_* definitions. The members of struct rlimit are longs. Thu Oct 24 17:43:34 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * MakeTAGS (sysdep-dirs): Fix typo. Wed Oct 23 03:45:22 1996 Ulrich Drepper <drepper@cygnus.com> * Makefile (headers): Don't mention libc-version.h. (install-others): ...but here. * time/strptime.c: Recognize %s, %u, %g, and %G format. nothing is found. This guarantees all subsequent calls behave * sysdeps/unix/sysv/linux/syscalls.list: Change function name for * io/getwd.c (getwd) [! PATH_MAX]: Don't assume that the user's buffer is any longer than the amount necessary to hold the filename; the Hurd getcwd uses the *entire* contents of the buffer, however long it is specified to be. * posix/getconf.c: De-ANSI-fy. Recognize POSIX.2 constant names. since these do not depend on the platform.
Diffstat (limited to 'locale/programs/ld-collate.c')
-rw-r--r-- | locale/programs/ld-collate.c | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 1bfa533d98..f836ecd578 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -98,8 +98,8 @@ struct locale_collate_t hash_table result; /* Sorting rules given in order_start line. */ - int nrules; - int nrules_max; + u_int32_t nrules; + u_int32_t nrules_max; enum coll_sort_rule *rules; /* Used while recognizing symbol composed of multiple tokens @@ -122,10 +122,10 @@ struct locale_collate_t /* While collecting the weigths we need some temporary space. */ unsigned int current_order; int *weight_cnt; - int weight_idx; + unsigned int weight_idx; unsigned int *weight; - int nweight; - int nweight_max; + size_t nweight; + size_t nweight_max; /* Patch lists. */ patch_t *current_patch; @@ -241,7 +241,7 @@ collate_finish (struct localedef_t *locale, struct charset_t *charset) if (value == 0) error_at_line (0, 0, patch->fname, patch->lineno, - _("no weight defined for symbol `%s'"), patch->token); + _("no weight defined for symbol `%s'"), patch->token); else *patch->where.pos = value; } @@ -482,7 +482,8 @@ Computing table size for collation information might take a while..."), ADD_VALUE (collate->undefined.ordering[cnt]); \ for (disp = 0; disp < collate->undefined.ordering[cnt]; ++disp) \ { \ - if (collate->undefined.ordering[idx] == ELLIPSIS_CHAR) \ + if ((wchar_t) collate->undefined.ordering[idx] \ + == ELLIPSIS_CHAR) \ ADD_VALUE ((pelem)->name[0]); \ else \ ADD_VALUE (collate->undefined.ordering[idx++]); \ @@ -540,7 +541,7 @@ Computing table size for collation information might take a while..."), size_t inner; for (inner = 0; inner < collate->nrules; ++inner) - if (collate->undefined.ordering[collate->nrules + inner] + if ((wchar_t)collate->undefined.ordering[collate->nrules + inner] == ELLIPSIS_CHAR) table[cnt * entry_size + 1 + inner] = cnt; else @@ -1049,11 +1050,11 @@ collate_element_to (struct linereader *lr, struct localedef_t *locale, } value = charset_find_value (charset, code->val.str.start, code->val.str.len); - if (value != ILLEGAL_CHAR_VALUE) + if ((wchar_t) value != ILLEGAL_CHAR_VALUE) { lr_error (lr, _("symbol for multicharacter collating element " "`%.*s' duplicates symbolic name in charset"), - code->val.str.len, code->val.str.start); + (int) code->val.str.len, code->val.str.start); return; } @@ -1062,7 +1063,7 @@ collate_element_to (struct linereader *lr, struct localedef_t *locale, { lr_error (lr, _("symbol for multicharacter collating element " "`%.*s' duplicates other element definition"), - code->val.str.len, code->val.str.start); + (int) code->val.str.len, code->val.str.start); return; } @@ -1071,7 +1072,7 @@ collate_element_to (struct linereader *lr, struct localedef_t *locale, { lr_error (lr, _("symbol for multicharacter collating element " "`%.*s' duplicates symbol definition"), - code->val.str.len, code->val.str.start); + (int) code->val.str.len, code->val.str.start); return; } @@ -1180,7 +1181,7 @@ collate_symbol (struct linereader *lr, struct localedef_t *locale, { lr_error (lr, _("symbol for multicharacter collating element " "`%.*s' duplicates symbolic name in charset"), - code->val.str.len, code->val.str.start); + (int) code->val.str.len, code->val.str.start); return; } @@ -1189,7 +1190,7 @@ collate_symbol (struct linereader *lr, struct localedef_t *locale, { lr_error (lr, _("symbol for multicharacter collating element " "`%.*s' duplicates element definition"), - code->val.str.len, code->val.str.start); + (int) code->val.str.len, code->val.str.start); return; } @@ -1198,7 +1199,7 @@ collate_symbol (struct linereader *lr, struct localedef_t *locale, { lr_error (lr, _("symbol for multicharacter collating element " "`%.*s' duplicates other symbol definition"), - code->val.str.len, code->val.str.start); + (int) code->val.str.len, code->val.str.start); return; } @@ -1256,7 +1257,7 @@ collate_order_elem (struct linereader *lr, struct localedef_t *locale, int result = 0; wchar_t value; void *tmp; - int i; + unsigned int i; switch (code->tok) { @@ -1284,7 +1285,7 @@ collate_order_elem (struct linereader *lr, struct localedef_t *locale, if (lastp->name[0] == value && lastp->name[1] == L'\0') { lr_error (lr, _("duplicate definition for character `%.*s'"), - code->val.str.len, code->val.str.start); + (int) code->val.str.len, code->val.str.start); lr_ignore_rest (lr, 0); result = -1; break; @@ -1311,7 +1312,7 @@ collate_order_elem (struct linereader *lr, struct localedef_t *locale, (void *) collate->current_element) < 0) { lr_error (lr, _("cannot insert collation element `%.*s'"), - code->val.str.len, code->val.str.start); + (int) code->val.str.len, code->val.str.start); exit (4); } } @@ -1344,8 +1345,8 @@ collation element `%.*s' appears more than once: ignore line"), if ((unsigned long int) tmp != 0ul) { lr_error (lr, _("\ -collation symbol `.*s' appears more than once: ignore line"), - code->val.str.len, code->val.str.start); +collation symbol `%.*s' appears more than once: ignore line"), + (int) code->val.str.len, code->val.str.start); lr_ignore_rest (lr, 0); result = -1; break; @@ -1364,7 +1365,7 @@ collation symbol `.*s' appears more than once: ignore line"), { if (verbose) lr_error (lr, _("unknown symbol `%.*s': line ignored"), - code->val.str.len, code->val.str.start); + (int) code->val.str.len, code->val.str.start); lr_ignore_rest (lr, 0); result = -1; @@ -1454,7 +1455,7 @@ line after ellipsis must contain character definition")); data[collate->nrules + cnt] = collate->weight[cnt]; for (cnt = 0; cnt < collate->nrules; ++cnt) - if (data[ptr[cnt]] != ELLIPSIS_CHAR) + if ((wchar_t) data[ptr[cnt]] != ELLIPSIS_CHAR) ptr[cnt] = 0; while (name[0] <= value) @@ -1555,7 +1556,7 @@ collate_weight_bsymbol (struct linereader *lr, struct localedef_t *locale, { if (verbose) lr_error (lr, _("unknown symbol `%.*s': line ignored"), - code->val.str.len, code->val.str.start); + (int) code->val.str.len, code->val.str.start); lr_ignore_rest (lr, 0); return -1; } @@ -1729,7 +1730,7 @@ collate_simple_weight (struct linereader *lr, struct localedef_t *locale, { if (verbose) lr_error (lr, _("unknown symbol `%.*s': line ignored"), - putp - startp, startp); + (int) (putp - startp), startp); lr_ignore_rest (lr, 0); return -1; } @@ -1741,8 +1742,8 @@ collate_simple_weight (struct linereader *lr, struct localedef_t *locale, if (*runp == lr->escape_char) { - static char digits[] = "0123456789abcdef"; - char *dp; + static const char digits[] = "0123456789abcdef"; + const char *dp; int base; ++runp; |