aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-11-19 08:43:18 +0000
committerUlrich Drepper <drepper@redhat.com>2003-11-19 08:43:18 +0000
commitebcf449fd415a0b4fbb7cd3284b744e911064009 (patch)
tree5c925e392e3d933f112760803c0738f6060cb223
parent3ee363e23115e63f8dcc34bf5b7bd5e1a084635c (diff)
downloadglibc-ebcf449fd415a0b4fbb7cd3284b744e911064009.tar
glibc-ebcf449fd415a0b4fbb7cd3284b744e911064009.tar.gz
glibc-ebcf449fd415a0b4fbb7cd3284b744e911064009.tar.bz2
glibc-ebcf449fd415a0b4fbb7cd3284b744e911064009.zip
Update.
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
-rw-r--r--ChangeLog8
-rw-r--r--posix/regex_internal.h4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e6ad1180b..8de71d7c4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index f905d2b510..0092b25c13 100644
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -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)