diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-10 23:05:57 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-10 23:05:57 -0700 |
| commit | da85a02af7585384008d3ebec836a7b8571f175d (patch) | |
| tree | e6d4f34119ea1c45985eaed207ef6b47f650ea93 /src/regex.c | |
| parent | 7f5515125fbc9b46454e1f84b7e3052a0a5326f0 (diff) | |
| parent | 4d45a8b7a237e1d33d0ae71d95a0ed7165ea6cda (diff) | |
Merge from trunk.
Diffstat (limited to 'src/regex.c')
| -rw-r--r-- | src/regex.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/regex.c b/src/regex.c index d347d27481..190d1d0fe2 100644 --- a/src/regex.c +++ b/src/regex.c @@ -2169,10 +2169,9 @@ extend_range_table_work_area (struct range_table_work_area *work_area) Returns -1 if successful, REG_ESPACE if ran out of space. */ static int -set_image_of_range_1 (work_area, start, end, translate) - RE_TRANSLATE_TYPE translate; - struct range_table_work_area *work_area; - re_wchar_t start, end; +set_image_of_range_1 (struct range_table_work_area *work_area, + re_wchar_t start, re_wchar_t end, + RE_TRANSLATE_TYPE translate) { /* `one_case' indicates a character, or a run of characters, each of which is an isolate (no case-equivalents). @@ -2322,10 +2321,9 @@ set_image_of_range_1 (work_area, start, end, translate) Returns -1 if successful, REG_ESPACE if ran out of space. */ static int -set_image_of_range (work_area, start, end, translate) - RE_TRANSLATE_TYPE translate; - struct range_table_work_area *work_area; - re_wchar_t start, end; +set_image_of_range (struct range_table_work_area *work_area, + re_wchar_t start, re_wchar_t end, + RE_TRANSLATE_TYPE translate) { re_wchar_t cmin, cmax; @@ -2412,8 +2410,7 @@ static re_char **best_regstart, **best_regend; but don't make them smaller. */ static -regex_grow_registers (num_regs) - int num_regs; +regex_grow_registers (int num_regs) { if (num_regs > regs_allocated_size) { |