diff options
| author | Paul Eggert | 2011-03-15 11:32:28 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-15 11:32:28 -0700 |
| commit | abbd1bcfeca309634cb602bc570f22e232846568 (patch) | |
| tree | 69ecac7c2649bd01604e8e87ec257f37e266e50f /src/regex.c | |
| parent | 19ed5445872476a2728c7f9a4f0e99976f5e2e23 (diff) | |
| download | emacs-abbd1bcfeca309634cb602bc570f22e232846568.tar.gz emacs-abbd1bcfeca309634cb602bc570f22e232846568.zip | |
* regex.c: (regex_compile, re_search_2, re_match_2_internal):
Remove unused local vars.
Diffstat (limited to 'src/regex.c')
| -rw-r--r-- | src/regex.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/regex.c b/src/regex.c index 6babbfbed76..e79316d6bc6 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -2571,9 +2571,6 @@ regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct | |||
| 2571 | /* If the object matched can contain multibyte characters. */ | 2571 | /* If the object matched can contain multibyte characters. */ |
| 2572 | const boolean multibyte = RE_MULTIBYTE_P (bufp); | 2572 | const boolean multibyte = RE_MULTIBYTE_P (bufp); |
| 2573 | 2573 | ||
| 2574 | /* If a target of matching can contain multibyte characters. */ | ||
| 2575 | const boolean target_multibyte = RE_TARGET_MULTIBYTE_P (bufp); | ||
| 2576 | |||
| 2577 | /* Nonzero if we have pushed down into a subpattern. */ | 2574 | /* Nonzero if we have pushed down into a subpattern. */ |
| 2578 | int in_subpattern = 0; | 2575 | int in_subpattern = 0; |
| 2579 | 2576 | ||
| @@ -2928,7 +2925,7 @@ regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct | |||
| 2928 | { | 2925 | { |
| 2929 | boolean escaped_char = false; | 2926 | boolean escaped_char = false; |
| 2930 | const unsigned char *p2 = p; | 2927 | const unsigned char *p2 = p; |
| 2931 | re_wchar_t ch, c2; | 2928 | re_wchar_t ch; |
| 2932 | 2929 | ||
| 2933 | if (p == pend) FREE_STACK_RETURN (REG_EBRACK); | 2930 | if (p == pend) FREE_STACK_RETURN (REG_EBRACK); |
| 2934 | 2931 | ||
| @@ -2991,10 +2988,7 @@ regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct | |||
| 2991 | them). */ | 2988 | them). */ |
| 2992 | if (c == ':' && *p == ']') | 2989 | if (c == ':' && *p == ']') |
| 2993 | { | 2990 | { |
| 2994 | re_wctype_t cc; | 2991 | re_wctype_t cc = re_wctype (str); |
| 2995 | int limit; | ||
| 2996 | |||
| 2997 | cc = re_wctype (str); | ||
| 2998 | 2992 | ||
| 2999 | if (cc == 0) | 2993 | if (cc == 0) |
| 3000 | FREE_STACK_RETURN (REG_ECTYPE); | 2994 | FREE_STACK_RETURN (REG_ECTYPE); |
| @@ -4558,7 +4552,6 @@ re_search_2 (struct re_pattern_buffer *bufp, const char *str1, int size1, const | |||
| 4558 | if (multibyte) | 4552 | if (multibyte) |
| 4559 | { | 4553 | { |
| 4560 | re_char *p = POS_ADDR_VSTRING (startpos); | 4554 | re_char *p = POS_ADDR_VSTRING (startpos); |
| 4561 | re_char *pend = STOP_ADDR_VSTRING (startpos); | ||
| 4562 | int len = BYTES_BY_CHAR_HEAD (*p); | 4555 | int len = BYTES_BY_CHAR_HEAD (*p); |
| 4563 | 4556 | ||
| 4564 | range -= len; | 4557 | range -= len; |
| @@ -5462,7 +5455,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int | |||
| 5462 | else | 5455 | else |
| 5463 | do | 5456 | do |
| 5464 | { | 5457 | { |
| 5465 | int pat_charlen, buf_charlen; | 5458 | int pat_charlen; |
| 5466 | int pat_ch, buf_ch; | 5459 | int pat_ch, buf_ch; |
| 5467 | 5460 | ||
| 5468 | PREFETCH (); | 5461 | PREFETCH (); |