[Emacs-diffs] /srv/bzr/emacs/trunk r103169: Merge: * lread.c: conform to C89 pointer rules

[Paul Eggert]

------------------------------------------------------------
revno: 103169 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 20:49:09 -0800
message:
  Merge: * lread.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/lread.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-07 04:43:35 +0000
+++ b/src/ChangeLog     2011-02-07 04:48:38 +0000
@@ -20,6 +20,7 @@
        (string_make_unibyte, Fstring_as_unibyte, Fstring_to_unibyte):
        (Fbase64_encode_region, base64_encode_1, Fbase64_decode_region, Fmd5):
        Likewise.
+       * lread.c (read1, hash_string): Likewise.
 
 2011-02-06  Paul Eggert  <address@hidden>
 

=== modified file 'src/lread.c'
--- a/src/lread.c       2011-01-30 22:17:44 +0000
+++ b/src/lread.c       2011-02-07 04:48:38 +0000
@@ -2771,7 +2771,8 @@
          ;
        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;
          }
        else
@@ -2841,7 +2842,7 @@
                }
 
              if (multibyte)
-               p += CHAR_STRING (c, p);
+               p += CHAR_STRING (c, (unsigned char *) p);
              else
                *p++ = c;
              c = READCHAR;
@@ -2950,7 +2951,9 @@
          Lisp_Object name, result;
          EMACS_INT nbytes = p - read_buffer;
          EMACS_INT nchars
-           = (multibyte ? multibyte_chars_in_text (read_buffer, nbytes)
+           = (multibyte
+              ? multibyte_chars_in_text ((unsigned char *) read_buffer,
+                                         nbytes)
               : nbytes);
 
          if (uninterned_symbol && ! NILP (Vpurify_flag))
@@ -3442,7 +3445,7 @@
 
 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.
    If it is one, return it.  */
@@ -3700,10 +3703,10 @@
 }
 
 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 unsigned char *end = p + len;
+  register const char *p = ptr;
+  register const char *end = p + len;
   register unsigned char c;
   register int hash = 0;