* keyboard.c (keyremap_step, read_key_sequence): Use size_t for sizes.

diff --git a/src/ChangeLog b/src/ChangeLog
index bfee23b16d0f1d1e3be8e46deeaef7a2289149e1..8b32aa78a6d5ac3f3a5367a8b6cf2e385b2cb0b8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * keyboard.c (parse_modifiers_uncached, parse_modifiers):
        Don't assume string length fits in int.
+       (keyremap_step, read_key_sequence): Use size_t for sizes.
 
        * callproc.c (Fcall_process, Fcall_process_region): Use SAFE_ALLOCA
        instead of alloca (Bug#8344).

diff --git a/src/keyboard.c b/src/keyboard.c
index e29c7e9bc5c0d1a3a2fc8250517e2c3d1306c73e..0fde344478ed0289d54705edb136675111f5f4a4 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1270,7 +1270,7 @@ some_mouse_moved (void)
 /* This is the actual command reading loop,
    sans error-handling encapsulation.  */
 
-static int read_key_sequence (Lisp_Object *, int, Lisp_Object,
+static int read_key_sequence (Lisp_Object *, size_t, Lisp_Object,
                               int, int, int);
 void safe_run_hooks (Lisp_Object);
 static void adjust_point_for_property (EMACS_INT, int);
@@ -8748,7 +8748,7 @@ access_keymap_keyremap (Lisp_Object map, Lisp_Object key, Lisp_Object prompt,
    The return value is non-zero if the remapping actually took place.  */
 
 static int
-keyremap_step (Lisp_Object *keybuf, int bufsize, volatile keyremap *fkey,
+keyremap_step (Lisp_Object *keybuf, size_t bufsize, volatile keyremap *fkey,
               int input, int doit, int *diff, Lisp_Object prompt)
 {
   Lisp_Object next, key;
@@ -8841,7 +8841,7 @@ keyremap_step (Lisp_Object *keybuf, int bufsize, volatile keyremap *fkey,
    from the selected window's buffer.  */
 
 static int
-read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
+read_key_sequence (Lisp_Object *keybuf, size_t bufsize, Lisp_Object prompt,
                   int dont_downcase_last, int can_return_switch_frame,
                   int fix_current_buffer)
 {