diff options
| author | Karl Heuer <[email protected]> | 1994-02-08 03:47:10 +0000 |
|---|---|---|
| committer | Karl Heuer <[email protected]> | 1994-02-08 03:47:10 +0000 |
| commit | 63268f7602b620bf584b1c16f83e4dbc4532b484 (patch) | |
| tree | f344eecc1bd6d24c68e305ba2dc9031d151c6b98 | |
| parent | 1a7ffe17b7e768c3c660f3a3fc419a47943df71f (diff) | |
*** empty log message ***
| -rw-r--r-- | src/regex.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/regex.c b/src/regex.c index 2d28eda701..e71961594b 100644 --- a/src/regex.c +++ b/src/regex.c @@ -256,6 +256,8 @@ char *alloca (); #define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) +#undef MAX +#undef MIN #define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b)) @@ -1500,7 +1502,7 @@ regex_compile (pattern, size, syntax, bufp) they can be reliably used as array indices. */ register unsigned char c, c1; - /* A random tempory spot in PATTERN. */ + /* A random temporary spot in PATTERN. */ const char *p1; /* Points to the end of the buffer, where we should append. */ @@ -2249,7 +2251,7 @@ regex_compile (pattern, size, syntax, bufp) we're all done, the pattern will look like: set_number_at <jump count> <upper bound> set_number_at <succeed_n count> <lower bound> - succeed_n <after jump addr> <succed_n count> + succeed_n <after jump addr> <succeed_n count> <body of loop> jump_n <succeed_n addr> <jump count> (The upper bound and `jump_n' are omitted if @@ -2493,12 +2495,7 @@ regex_compile (pattern, size, syntax, bufp) is strictly greater than re_max_failures, the largest possible stack is 2 * re_max_failures failure points. */ fail_stack.size = (2 * re_max_failures * MAX_FAILURE_ITEMS); - if (fail_stack.stack) - fail_stack.stack = - (fail_stack_elt_t *) realloc (fail_stack.stack, - (fail_stack.size - * sizeof (fail_stack_elt_t))); - else + if (! fail_stack.stack) fail_stack.stack = (fail_stack_elt_t *) malloc (fail_stack.size * sizeof (fail_stack_elt_t)); |