lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

* posix/regexec.c (check_node_accept_bytes): Correct cast to avoid

Browse Source 
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.
This commit is contained in:
Ulrich Drepper
2005-03-06 07:27:56 +00:00
parent 3cc4a09733
commit 1c99f950d1
11 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
posix/regex_internal.c
View File

@ -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',