diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-03-01 01:14:31 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-03-01 01:14:31 +0000 |
| commit | 85c54a327d4c05381603eb49792afa5ad5dbe46c (patch) | |
| tree | 28d72a81272c492df13480a10fc33ea14dd87e9d /posix/regexec.c | |
| parent | a6861e64bc7f4e16087b7f9713614c1f35e12df7 (diff) | |
Update.glibc-2.3.2cvs/glibc-2_3_2
* argp/argp.h: Fix a typo.
Reported by H.S.Teoh <hsteoh@quickfur.ath.cx>.
* manual/terminal.texi: Fix cfmakeraw() definition from int to void.
2003-02-27 Pat Rankin <rankin@pactechdata.com>
* posix/regexec.c (proceed_next_node): Cast re_string_get_buffer to
char *.
(get_subexp): Likewise.
2003-03-01 GOTO Masanori <gotom@debian.or.jp>
Diffstat (limited to 'posix/regexec.c')
| -rw-r--r-- | posix/regexec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/posix/regexec.c b/posix/regexec.c index eb16baabea..6ea14a6c48 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -1171,7 +1171,7 @@ proceed_next_node (preg, nregs, regs, mctx, pidx, node, eps_via_nodes, fs) return -1; else if (naccepted) { - char *buf = re_string_get_buffer (mctx->input); + char *buf = (char *) re_string_get_buffer (mctx->input); if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, naccepted) != 0) return -1; @@ -2468,7 +2468,7 @@ get_subexp (preg, mctx, bkref_node, bkref_str_idx) { int subexp_num, sub_top_idx; re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - char *buf = re_string_get_buffer (mctx->input); + char *buf = (char *) re_string_get_buffer (mctx->input); /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX. */ int cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx); for (; cache_idx < mctx->nbkref_ents; ++cache_idx) @@ -3459,7 +3459,8 @@ check_node_accept_bytes (preg, node_idx, input, str_idx) { const re_charset_t *cset = node->opr.mbcset; # ifdef _LIBC - const unsigned char *pin = re_string_get_buffer (input) + str_idx; + const unsigned char *pin = ((char *) re_string_get_buffer (input) + + str_idx); # endif /* _LIBC */ int match_len = 0; wchar_t wc = ((cset->nranges || cset->nchar_classes || cset->nmbchars) |