diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | posix/regex.c | 17 |
2 files changed, 11 insertions, 15 deletions
@@ -1,3 +1,12 @@ +2000-08-03 Greg McGary <greg@mcgary.org> + + * sysdeps/unix/sysv/syscalls.list (time, utime): Correct signatures. + * io/test-utime.c: Test passing NULL as utimbuf* arg. + + * posix/regex.c (EXTEND_BUFFER_HIGH_BOUND): Remove macro. + (MOVE_BUFFER_POINTER): Handle high_bound properly. + (EXTEND_BUFFER): Don't call EXTEND_BUFFER_HIGH_BOUND. + 2000-08-03 Ulrich Drepper <drepper@redhat.com> * iconvdata/big5.c: Updated. diff --git a/posix/regex.c b/posix/regex.c index 09d0a35e85..8bd6ac7a2c 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -1749,22 +1749,10 @@ static reg_errcode_t compile_range _RE_ARGS ((unsigned int range_start, being larger than MAX_BUF_SIZE, then flag memory exhausted. */ #if __BOUNDED_POINTERS__ # define MOVE_BUFFER_POINTER(P) \ - (__ptrlow (P) += incr, __ptrhigh (P) += incr, __ptrvalue (P) += incr) -# define EXTEND_BUFFER_HIGH_BOUND \ - do { \ - int incr = bufp->allocated >> 1; \ - __ptrhigh b += incr; \ - __ptrhigh begalt += incr; \ - if (fixup_alt_jump) \ - __ptrhigh fixup_alt_jump += incr; \ - if (laststart) \ - __ptrhigh laststart += incr; \ - if (pending_exact) \ - __ptrhigh pending_exact += incr; \ - } while (0) + (__ptrhigh (P) = (__ptrlow (P) += incr) + bufp->allocated, \ + __ptrvalue (P) += incr) #else # define MOVE_BUFFER_POINTER(P) (P) += incr -# define EXTEND_BUFFER_HIGH_BOUND #endif #define EXTEND_BUFFER() \ do { \ @@ -1790,7 +1778,6 @@ static reg_errcode_t compile_range _RE_ARGS ((unsigned int range_start, if (pending_exact) \ MOVE_BUFFER_POINTER (pending_exact); \ } \ - EXTEND_BUFFER_HIGH_BOUND; \ } while (0) |