2003-11-19  Ulrich Drepper  <drepper@redhat.com>

	* posix/regex_internal.h (re_string_first_byte): Use ->valid_len
	not ->len.
	(re_string_is_single_byte_char): Likewise.

	* posix/regexec.c (get_subexp): After calling get_subexp_seb
This commit is contained in:
Ulrich Drepper 2003-11-19 08:43:18 +00:00
parent 3ee363e231
commit ebcf449fd4
2 changed files with 9 additions and 3 deletions

View File

@ -1,6 +1,12 @@
2003-11-19 Ulrich Drepper <drepper@redhat.com>
* posix/regex_internal.h (re_string_first_byte): Use ->valid_len
not ->len.
(re_string_is_single_byte_char): Likewise.
2003-11-18 Ulrich Drepper <drepper@redhat.com>
* posix/regexec.c (get_subexp): Adter calling get_subexp_seb
* posix/regexec.c (get_subexp): After calling get_subexp_seb
reload buf and bkref_str. Little optimization by avoiding memcmp.
2003-11-14 David Mosberger <davidm@hpl.hp.com>

View File

@ -379,9 +379,9 @@ static unsigned int re_string_context_at (const re_string_t *input, int idx,
#define re_string_fetch_byte_case(pstr) \
((pstr)->mbs_case[(pstr)->cur_idx++])
#define re_string_first_byte(pstr, idx) \
((idx) == (pstr)->len || (pstr)->wcs[idx] != WEOF)
((idx) == (pstr)->valid_len || (pstr)->wcs[idx] != WEOF)
#define re_string_is_single_byte_char(pstr, idx) \
((pstr)->wcs[idx] != WEOF && ((pstr)->len == (idx) \
((pstr)->wcs[idx] != WEOF && ((pstr)->valid_len == (idx) \
|| (pstr)->wcs[(idx) + 1] != WEOF))
#define re_string_eoi(pstr) ((pstr)->stop <= (pstr)->cur_idx)
#define re_string_cur_idx(pstr) ((pstr)->cur_idx)