* fns.c (substring_both): Remove var that is set but not used.

diff --git a/src/ChangeLog b/src/ChangeLog
index fe7779304ad9e5dbcbb0136f76f1678a8b058e8b..04a27863fd06e03561f7251ecf9d834c770523db 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-03  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * fns.c (substring_both): Remove var that is set but not used.
+
        * eval.c (funcall_lambda): Rename local to avoid shadowing.
 
        * alloc.c (mark_object_loop_halt, mark_object): Use size_t, not int.

diff --git a/src/fns.c b/src/fns.c
index bce922859d1169dcd13e0aad0409cf031e2a3fb6..8346dbc690a21bbd607017c5b912341456680a9e 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -1247,17 +1247,10 @@ substring_both (Lisp_Object string, EMACS_INT from, EMACS_INT from_byte,
 {
   Lisp_Object res;
   EMACS_INT size;
-  EMACS_INT size_byte;
 
   CHECK_VECTOR_OR_STRING (string);
 
-  if (STRINGP (string))
-    {
-      size = SCHARS (string);
-      size_byte = SBYTES (string);
-    }
-  else
-    size = ASIZE (string);
+  size = STRINGP (string) ? SCHARS (string) : ASIZE (string);
 
   if (!(0 <= from && from <= to && to <= size))
     args_out_of_range_3 (string, make_number (from), make_number (to));