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 /posix | |
| parent | 3cc4a09733deb0e9313f820e148ada9a3007e6b0 (diff) | |
| download | glibc-1c99f950d19adb5ed56839d2eee4ba6db1d179b4.zip glibc-1c99f950d19adb5ed56839d2eee4ba6db1d179b4.tar.gz glibc-1c99f950d19adb5ed56839d2eee4ba6db1d179b4.tar.bz2 | |
* 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 'posix')
| -rw-r--r-- | posix/regex_internal.c | 15 | ||||
| -rw-r--r-- | posix/regexec.c | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/posix/regex_internal.c b/posix/regex_internal.c index c3295a8..779d0b7 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -214,7 +214,8 @@ build_wcs_buffer (pstr) re_string_t *pstr; { #ifdef _LIBC - unsigned char buf[pstr->mb_cur_max]; + unsigned char buf[MB_CUR_MAX]; + assert (MB_CUR_MAX >= pstr->mb_cur_max); #else unsigned char buf[64]; #endif @@ -282,9 +283,10 @@ build_wcs_upper_buffer (pstr) mbstate_t prev_st; int src_idx, byte_idx, end_idx, mbclen, remain_len; #ifdef _LIBC - unsigned char buf[pstr->mb_cur_max]; + char buf[MB_CUR_MAX]; + assert (MB_CUR_MAX >= pstr->mb_cur_max); #else - unsigned char buf[64]; + char buf[64]; #endif byte_idx = pstr->valid_len; @@ -666,8 +668,9 @@ re_string_reconstruct (pstr, idx, eflags) /* XXX Don't use mbrtowc, we know which conversion to use (UTF-8 -> UCS4). */ memset (&cur_state, 0, sizeof (cur_state)); - mlen = mbrtowc (&wc2, p, mlen, &cur_state) - - (raw + offset - p); + mlen = (mbrtowc (&wc2, (const char *) p, mlen, + &cur_state) + - (raw + offset - p)); if (mlen >= 0) { memset (&pstr->cur_state, '\0', diff --git a/posix/regexec.c b/posix/regexec.c index 636396e..3c226e3 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -3781,8 +3781,8 @@ check_node_accept_bytes (dfa, node_idx, input, str_idx) { const re_charset_t *cset = node->opr.mbcset; # ifdef _LIBC - const unsigned char *pin = ((char *) re_string_get_buffer (input) - + str_idx); + const unsigned char *pin + = ((const unsigned char *) re_string_get_buffer (input) + str_idx); int j; uint32_t nrules; # endif /* _LIBC */ |