From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 3 Apr 2011 01:52:02 +0000 (-0700)
Subject: * search.c (boyer_moore, wordify): Remove vars set but not used.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~394^2~46
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f1d93214d8221e0dfe7bf750b29d49b1271b0ca;p=emacs.git

* search.c (boyer_moore, wordify): Remove vars set but not used.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5805a8c1611..3b099c02c25 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-03  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* search.c (boyer_moore, wordify): Remove vars set but not used.
+
 	* indent.c (MULTIBYTE_BYTES_WIDTH): Don't compute wide_column.
 	All callers changed.  This avoids the need for an unused var.
 
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,
   int translate_prev_byte1 = 0;
   int translate_prev_byte2 = 0;
   int translate_prev_byte3 = 0;
-  int translate_prev_byte4 = 0;
 
   /* The general approach is that we are going to maintain that we know
      the first (closest to the present position, in whatever direction
@@ -1730,11 +1729,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
 	{
 	  translate_prev_byte2 = str[cblen - 3];
 	  if (cblen > 3)
-	    {
-	      translate_prev_byte3 = str[cblen - 4];
-	      if (cblen > 4)
-		translate_prev_byte4 = str[cblen - 5];
-	    }
+	    translate_prev_byte3 = str[cblen - 4];
 	}
     }
 
@@ -2091,7 +2086,7 @@ set_search_regs (EMACS_INT beg_byte, EMACS_INT nbytes)
 static Lisp_Object
 wordify (Lisp_Object string, int lax)
 {
-  register unsigned char *p, *o;
+  register unsigned char *o;
   register EMACS_INT i, i_byte, len, punct_count = 0, word_count = 0;
   Lisp_Object val;
   int prev_c = 0;
@@ -2099,7 +2094,6 @@ wordify (Lisp_Object string, int lax)
   int whitespace_at_end;
 
   CHECK_STRING (string);
-  p = SDATA (string);
   len = SCHARS (string);
 
   for (i = 0, i_byte = 0; i < len; )