aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-02 22:46:57 -0700
committerPaul Eggert2011-04-02 22:46:57 -0700
commit0bc0b309f6023bbfe14683095bea3bbf536b4602 (patch)
tree1c2efe9eafbdb8b3ae1e3855622fe5324355a571
parente610eacace2a338cdc868db135863a9fea04d2bc (diff)
downloademacs-0bc0b309f6023bbfe14683095bea3bbf536b4602.tar.gz
emacs-0bc0b309f6023bbfe14683095bea3bbf536b4602.zip
* fns.c (substring_both): Remove var that is set but not used.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/fns.c9
2 files changed, 3 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fe7779304ad..04a27863fd0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-04-03 Paul Eggert <eggert@cs.ucla.edu> 12011-04-03 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * fns.c (substring_both): Remove var that is set but not used.
4
3 * eval.c (funcall_lambda): Rename local to avoid shadowing. 5 * eval.c (funcall_lambda): Rename local to avoid shadowing.
4 6
5 * alloc.c (mark_object_loop_halt, mark_object): Use size_t, not int. 7 * alloc.c (mark_object_loop_halt, mark_object): Use size_t, not int.
diff --git a/src/fns.c b/src/fns.c
index bce922859d1..8346dbc690a 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1247,17 +1247,10 @@ substring_both (Lisp_Object string, EMACS_INT from, EMACS_INT from_byte,
1247{ 1247{
1248 Lisp_Object res; 1248 Lisp_Object res;
1249 EMACS_INT size; 1249 EMACS_INT size;
1250 EMACS_INT size_byte;
1251 1250
1252 CHECK_VECTOR_OR_STRING (string); 1251 CHECK_VECTOR_OR_STRING (string);
1253 1252
1254 if (STRINGP (string)) 1253 size = STRINGP (string) ? SCHARS (string) : ASIZE (string);
1255 {
1256 size = SCHARS (string);
1257 size_byte = SBYTES (string);
1258 }
1259 else
1260 size = ASIZE (string);
1261 1254
1262 if (!(0 <= from && from <= to && to <= size)) 1255 if (!(0 <= from && from <= to && to <= size))
1263 args_out_of_range_3 (string, make_number (from), make_number (to)); 1256 args_out_of_range_3 (string, make_number (from), make_number (to));