diff options
| author | Paul Eggert | 2011-04-02 18:52:02 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-02 18:52:02 -0700 |
| commit | 1f1d93214d8221e0dfe7bf750b29d49b1271b0ca (patch) | |
| tree | 09dc3ec68bcf8d75773f2324da67dd8edd3306a3 /src | |
| parent | c59478bce26f5b9ab3cfce01259a2946437b447a (diff) | |
| download | emacs-1f1d93214d8221e0dfe7bf750b29d49b1271b0ca.tar.gz emacs-1f1d93214d8221e0dfe7bf750b29d49b1271b0ca.zip | |
* search.c (boyer_moore, wordify): Remove vars set but not used.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/search.c | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5805a8c1611..3b099c02c25 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-04-03 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-03 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * search.c (boyer_moore, wordify): Remove vars set but not used. | ||
| 4 | |||
| 3 | * indent.c (MULTIBYTE_BYTES_WIDTH): Don't compute wide_column. | 5 | * indent.c (MULTIBYTE_BYTES_WIDTH): Don't compute wide_column. |
| 4 | All callers changed. This avoids the need for an unused var. | 6 | All callers changed. This avoids the need for an unused var. |
| 5 | 7 | ||
diff --git a/src/search.c b/src/search.c index 682fa185bbb..4358bf2186a 100644 --- a/src/search.c +++ b/src/search.c | |||
| @@ -1674,7 +1674,6 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat, | |||
| 1674 | int translate_prev_byte1 = 0; | 1674 | int translate_prev_byte1 = 0; |
| 1675 | int translate_prev_byte2 = 0; | 1675 | int translate_prev_byte2 = 0; |
| 1676 | int translate_prev_byte3 = 0; | 1676 | int translate_prev_byte3 = 0; |
| 1677 | int translate_prev_byte4 = 0; | ||
| 1678 | 1677 | ||
| 1679 | /* The general approach is that we are going to maintain that we know | 1678 | /* The general approach is that we are going to maintain that we know |
| 1680 | the first (closest to the present position, in whatever direction | 1679 | the first (closest to the present position, in whatever direction |
| @@ -1730,11 +1729,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat, | |||
| 1730 | { | 1729 | { |
| 1731 | translate_prev_byte2 = str[cblen - 3]; | 1730 | translate_prev_byte2 = str[cblen - 3]; |
| 1732 | if (cblen > 3) | 1731 | if (cblen > 3) |
| 1733 | { | 1732 | translate_prev_byte3 = str[cblen - 4]; |
| 1734 | translate_prev_byte3 = str[cblen - 4]; | ||
| 1735 | if (cblen > 4) | ||
| 1736 | translate_prev_byte4 = str[cblen - 5]; | ||
| 1737 | } | ||
| 1738 | } | 1733 | } |
| 1739 | } | 1734 | } |
| 1740 | 1735 | ||
| @@ -2091,7 +2086,7 @@ set_search_regs (EMACS_INT beg_byte, EMACS_INT nbytes) | |||
| 2091 | static Lisp_Object | 2086 | static Lisp_Object |
| 2092 | wordify (Lisp_Object string, int lax) | 2087 | wordify (Lisp_Object string, int lax) |
| 2093 | { | 2088 | { |
| 2094 | register unsigned char *p, *o; | 2089 | register unsigned char *o; |
| 2095 | register EMACS_INT i, i_byte, len, punct_count = 0, word_count = 0; | 2090 | register EMACS_INT i, i_byte, len, punct_count = 0, word_count = 0; |
| 2096 | Lisp_Object val; | 2091 | Lisp_Object val; |
| 2097 | int prev_c = 0; | 2092 | int prev_c = 0; |
| @@ -2099,7 +2094,6 @@ wordify (Lisp_Object string, int lax) | |||
| 2099 | int whitespace_at_end; | 2094 | int whitespace_at_end; |
| 2100 | 2095 | ||
| 2101 | CHECK_STRING (string); | 2096 | CHECK_STRING (string); |
| 2102 | p = SDATA (string); | ||
| 2103 | len = SCHARS (string); | 2097 | len = SCHARS (string); |
| 2104 | 2098 | ||
| 2105 | for (i = 0, i_byte = 0; i < len; ) | 2099 | for (i = 0, i_byte = 0; i < len; ) |