diff src/ccl.c @ 110552:66f6be9b4d43

Fix int/EMACS_INT use in ccl.c, cmds.c, data.c, dispnew.c. keyboard.c (make_lispy_position): Use EMACS_INT for buffer positions. xdisp.c (redisplay_internal, try_window_id) (set_cursor_from_row, find_first_unchanged_at_end_row): Use EMACS_INT for buffer positions. dispextern.h (set_cursor_from_row, mode_line_string) (marginal_area_string): Adjust prototypes. dispnew.c (increment_matrix_positions) (increment_row_positions, copy_glyph_row_contents) (mode_line_string, marginal_area_string): Use EMACS_INT for buffer positions. dispextern.h (mode_line_string, marginal_area_string) (increment_matrix_positions, increment_row_positions): Adjust prototypes. data.c (Faref, Faset): Use EMACS_INT for string length and positions. cmds.c (internal_self_insert): Use EMACS_INT for the count of characters to insert. ccl.c (Fccl_execute_on_string): Use EMACS_INT for string position and size.

--- a/src/ccl.c	Fri Sep 24 11:24:47 2010 -0400
+++ b/src/ccl.c	Fri Sep 24 13:48:10 2010 -0400
@@ -2061,10 +2061,10 @@
   int i;
   int outbufsize;
   unsigned char *outbuf, *outp;
-  int str_chars, str_bytes;
+  EMACS_INT str_chars, str_bytes;
 #define CCL_EXECUTE_BUF_SIZE 1024
   int source[CCL_EXECUTE_BUF_SIZE], destination[CCL_EXECUTE_BUF_SIZE];
-  int consumed_chars, consumed_bytes, produced_chars;
+  EMACS_INT consumed_chars, consumed_bytes, produced_chars;
 
   if (setup_ccl_program (&ccl, ccl_prog) < 0)
     error ("Invalid CCL program");
@@ -2128,7 +2128,7 @@
 	      if (outp - outbuf + MAX_MULTIBYTE_LENGTH * ccl.produced
 		  > outbufsize)
 		{
-		  int offset = outp - outbuf;
+		  EMACS_INT offset = outp - outbuf;
 		  outbufsize += MAX_MULTIBYTE_LENGTH * ccl.produced;
 		  outbuf = (unsigned char *) xrealloc (outbuf, outbufsize);
 		  outp = outbuf + offset;
@@ -2140,7 +2140,7 @@
 	    {
 	      if (outp - outbuf + ccl.produced > outbufsize)
 		{
-		  int offset = outp - outbuf;
+		  EMACS_INT offset = outp - outbuf;
 		  outbufsize += ccl.produced;
 		  outbuf = (unsigned char *) xrealloc (outbuf, outbufsize);
 		  outp = outbuf + offset;