Commit 4a25e32a authored by Paul Eggert's avatar Paul Eggert
Browse files

* lread.c: conform to C89 pointer rules

parent f1e59824
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
(string_make_unibyte, Fstring_as_unibyte, Fstring_to_unibyte): (string_make_unibyte, Fstring_as_unibyte, Fstring_to_unibyte):
(Fbase64_encode_region, base64_encode_1, Fbase64_decode_region, Fmd5): (Fbase64_encode_region, base64_encode_1, Fbase64_decode_region, Fmd5):
Likewise. Likewise.
* lread.c (read1, hash_string): Likewise.
   
2011-02-06 Paul Eggert <eggert@cs.ucla.edu> 2011-02-06 Paul Eggert <eggert@cs.ucla.edu>
   
...@@ -2771,7 +2771,8 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) ...@@ -2771,7 +2771,8 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
; ;
else if (force_singlebyte) else if (force_singlebyte)
{ {
nchars = str_as_unibyte (read_buffer, p - read_buffer); nchars = str_as_unibyte ((unsigned char *) read_buffer,
p - read_buffer);
p = read_buffer + nchars; p = read_buffer + nchars;
} }
else else
...@@ -2841,7 +2842,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) ...@@ -2841,7 +2842,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
} }
if (multibyte) if (multibyte)
p += CHAR_STRING (c, p); p += CHAR_STRING (c, (unsigned char *) p);
else else
*p++ = c; *p++ = c;
c = READCHAR; c = READCHAR;
...@@ -2950,7 +2951,9 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) ...@@ -2950,7 +2951,9 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
Lisp_Object name, result; Lisp_Object name, result;
EMACS_INT nbytes = p - read_buffer; EMACS_INT nbytes = p - read_buffer;
EMACS_INT nchars EMACS_INT nchars
= (multibyte ? multibyte_chars_in_text (read_buffer, nbytes) = (multibyte
? multibyte_chars_in_text ((unsigned char *) read_buffer,
nbytes)
: nbytes); : nbytes);
if (uninterned_symbol && ! NILP (Vpurify_flag)) if (uninterned_symbol && ! NILP (Vpurify_flag))
...@@ -3442,7 +3445,7 @@ Lisp_Object initial_obarray; ...@@ -3442,7 +3445,7 @@ Lisp_Object initial_obarray;
int oblookup_last_bucket_number; int oblookup_last_bucket_number;
static int hash_string (const unsigned char *ptr, int len); static int hash_string (const char *ptr, int len);
/* Get an error if OBARRAY is not an obarray. /* Get an error if OBARRAY is not an obarray.
If it is one, return it. */ If it is one, return it. */
...@@ -3700,10 +3703,10 @@ oblookup (Lisp_Object obarray, register const char *ptr, EMACS_INT size, EMACS_I ...@@ -3700,10 +3703,10 @@ oblookup (Lisp_Object obarray, register const char *ptr, EMACS_INT size, EMACS_I
} }
static int static int
hash_string (const unsigned char *ptr, int len) hash_string (const char *ptr, int len)
{ {
register const unsigned char *p = ptr; register const char *p = ptr;
register const unsigned char *end = p + len; register const char *end = p + len;
register unsigned char c; register unsigned char c;
register int hash = 0; register int hash = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment