diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-11-18 07:25:02 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-11-18 07:25:02 +0000 |
| commit | 5f93cd52f626b77301c5e1db3d973eefc534323b (patch) | |
| tree | 8bf877d6a8b552be0cd43b88c7540cdbc63397d6 /posix/regexec.c | |
| parent | 5ddb5bf5fbceb6f44f04f7267eb214eee5fc2f90 (diff) | |
| download | glibc-5f93cd52f626b77301c5e1db3d973eefc534323b.tar.gz glibc-5f93cd52f626b77301c5e1db3d973eefc534323b.tar.xz glibc-5f93cd52f626b77301c5e1db3d973eefc534323b.zip | |
Update.
2003-11-17 Jakub Jelinek <jakub@redhat.com> * posix/regcomp.c (optimize_utf8): Optimize multi-byte chars as well. * posix/bug-regex20.c (tests): Add new tests. Multi-byte char followed by dup operator is expected to be optimized. * posix/regexec.c (check_node_accept_bytes): Move nrules and j variables to the block where they are only used, initialize nrules only immediately before using it. 2003-11-15 Andreas Jaeger <aj@suse.de> * sysdeps/x86_64/fpu/s_scalbnl.S: New file. * sysdeps/x86_64/fpu/s_truncl.S: New file. * sysdeps/x86_64/fpu/s_nearbyintl.S: New file. * sysdeps/x86_64/fpu/s_floorl.S: New file. * sysdeps/x86_64/fpu/s_ilogbl.S: New file. * sysdeps/x86_64/fpu/e_remainderl.S: New file. * math/libm-test.inc (floor_test): Test also ±0.25. (ceil_test): Test -0.25.
Diffstat (limited to 'posix/regexec.c')
| -rw-r--r-- | posix/regexec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/posix/regexec.c b/posix/regexec.c index 7470197506..09756b7691 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -3483,10 +3483,6 @@ check_node_accept_bytes (preg, node_idx, input, str_idx) int elem_len = re_string_elem_size_at (input, str_idx); int char_len = re_string_char_size_at (input, str_idx); int i; -# ifdef _LIBC - int j; - uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); -# endif /* _LIBC */ if (elem_len <= 1 && char_len <= 1) return 0; if (node->type == OP_PERIOD) @@ -3505,6 +3501,8 @@ check_node_accept_bytes (preg, node_idx, input, str_idx) # ifdef _LIBC const unsigned char *pin = ((char *) re_string_get_buffer (input) + str_idx); + int j; + uint32_t nrules; # endif /* _LIBC */ int match_len = 0; wchar_t wc = ((cset->nranges || cset->nchar_classes || cset->nmbchars) @@ -3529,6 +3527,7 @@ check_node_accept_bytes (preg, node_idx, input, str_idx) } # ifdef _LIBC + nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); if (nrules != 0) { unsigned int in_collseq = 0; |