(syms_of_charset): Remove unused var p.

(find_charsets_in_text, Ffind_charset_region): Use EMACS_INT for
byte/char counts.

diff --git a/src/charset.c b/src/charset.c
index 19c75538340832d209fc55466472c045e5d55a11..88752a80b79f049e75ad7448dea594d9d393c294 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1375,7 +1375,7 @@ string_xstring_p (string)
 static void
 find_charsets_in_text (ptr, nchars, nbytes, charsets, table)
      const unsigned char *ptr;
-     int nchars, nbytes;
+     EMACS_INT nchars, nbytes;
      Lisp_Object charsets, table;
 {
   const unsigned char *pend = ptr + nbytes;
@@ -1424,7 +1424,8 @@ only `ascii', `eight-bit-control', and `eight-bit-graphic'.  */)
      Lisp_Object beg, end, table;
 {
   Lisp_Object charsets;
-  int from, from_byte, to, stop, stop_byte, i;
+  EMACS_INT from, from_byte, to, stop, stop_byte;
+  int i;
   Lisp_Object val;
 
   validate_region (&beg, &end);
@@ -2073,8 +2074,6 @@ init_charset_once ()
 void
 syms_of_charset ()
 {
-  char *p;
-
   DEFSYM (Qcharsetp, "charsetp");
 
   DEFSYM (Qascii, "ascii");
@@ -2085,8 +2084,6 @@ syms_of_charset ()
   DEFSYM (Qgl, "gl");
   DEFSYM (Qgr, "gr");
 
-  p = (char *) xmalloc (30000);
-
   staticpro (&Vcharset_ordered_list);
   Vcharset_ordered_list = Qnil;