diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-03-06 07:27:56 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-03-06 07:27:56 +0000 |
| commit | 1c99f950d19adb5ed56839d2eee4ba6db1d179b4 (patch) | |
| tree | 1bdd7542eefd2938c5cf71efd8f3b74b9bd7d85d /locale/weightwc.h | |
| parent | 3cc4a09733deb0e9313f820e148ada9a3007e6b0 (diff) | |
| download | glibc-1c99f950d19adb5ed56839d2eee4ba6db1d179b4.tar glibc-1c99f950d19adb5ed56839d2eee4ba6db1d179b4.tar.gz glibc-1c99f950d19adb5ed56839d2eee4ba6db1d179b4.tar.bz2 glibc-1c99f950d19adb5ed56839d2eee4ba6db1d179b4.zip | |
* posix/regexec.c (check_node_accept_bytes): Correct cast to avoid
warning.
* posix/regex_internal.c (re_string_reconstruct): Add cast to
avoid warning.
(build_wcs_upper_buffer): Change type of bug to plain char.
* locale/weightwc.h (findidx): Add casts to avoid warnings.
* time/mktime.c (ranged_convert): Initialize tm to make the
compiler happy.
* wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Add casts to avoid warnings.
* wcsmbs/wcsnrtombs.c (__wcsnrtombs): Add casts to avoid warnings.
* wcsmbs/mbsnrtowcs.c: Add casts to avoid warnings.
* wcsmbs/wcsrtombs.c (__wcsrtombs): Add casts to avoid warnings.
* wcsmbs/wcrtomb.c (__wcrtomb): Add casts to avoid warnings.
* wcsmbs/mbrtowc.c (__mbrtowc): Use unsigned char for outbuf.
* posix/regex_internal.c [_LIBC] (build_wcs_buffer): Avoid using
dynamically sized array.
(build_wcs_upper_buffer): Likewise.
Diffstat (limited to 'locale/weightwc.h')
| -rw-r--r-- | locale/weightwc.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/locale/weightwc.h b/locale/weightwc.h index ff5e63aeef..436aa7e548 100644 --- a/locale/weightwc.h +++ b/locale/weightwc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2000, 2001,2003,2004 Free Software Foundation, Inc. +/* Copyright (C) 1996-2001,2003,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Ulrich Drepper, <drepper@cygnus.com>. @@ -22,12 +22,8 @@ auto inline int32_t __attribute ((always_inline)) findidx (const wint_t **cpp) { - int32_t i; - const wint_t *cp; - wint_t ch; - - ch = *(*cpp)++; - i = __collidx_table_lookup ((const char *) table, ch); + wint_t ch = *(*cpp)++; + int32_t i = __collidx_table_lookup ((const char *) table, ch); if (i >= 0) /* This is an index into the weight table. Cool. */ @@ -35,11 +31,11 @@ findidx (const wint_t **cpp) /* Oh well, more than one sequence starting with this byte. Search for the correct one. */ - cp = &extra[-i]; + const int32_t *cp = &extra[-i]; while (1) { size_t nhere; - const wint_t *usrc = *cpp; + const int32_t *usrc = (const int32_t *) *cpp; /* The first thing is the index. */ i = *cp++; |