[Emacs-diffs] /srv/bzr/emacs/trunk r103138: * doc.c: conform to C89 pointer rules

[Paul Eggert]

------------------------------------------------------------
revno: 103138 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-05 18:01:17 -0800
message:
  * doc.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/doc.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-06 01:25:41 +0000
+++ b/src/ChangeLog     2011-02-06 01:56:00 +0000
@@ -1,3 +1,10 @@
+2011-02-06  Paul Eggert  <address@hidden>
+
+       * doc.c: conform to C89 pointer rules
+       (get_doc_string, Fsnarf_documentation, Fsubstitute_command_keys):
+       Change types between char * and unsigned char *, to satisfy C89
+       rules about pointer type compatibility.
+
 2011-02-05  Paul Eggert  <address@hidden>
 
        don't ignore chdir failure

=== modified file 'src/doc.c'
--- a/src/doc.c 2011-01-30 22:17:44 +0000
+++ b/src/doc.c 2011-02-06 01:56:00 +0000
@@ -260,7 +260,7 @@
      the same way we would read bytes from a file.  */
   if (definition)
     {
-      read_bytecode_pointer = get_doc_string_buffer + offset;
+      read_bytecode_pointer = (unsigned char *) get_doc_string_buffer + offset;
       return Fread (Qlambda);
     }
 
@@ -270,8 +270,10 @@
   else
     {
       /* The data determines whether the string is multibyte.  */
-      EMACS_INT nchars = multibyte_chars_in_text (get_doc_string_buffer + 
offset,
-                                                 to - (get_doc_string_buffer + 
offset));
+      EMACS_INT nchars =
+       multibyte_chars_in_text (((unsigned char *) get_doc_string_buffer
+                                 + offset),
+                                to - (get_doc_string_buffer + offset));
       return make_string_from_bytes (get_doc_string_buffer + offset,
                                     nchars,
                                     to - (get_doc_string_buffer + offset));
@@ -630,7 +632,8 @@
             }
 
          sym = oblookup (Vobarray, p + 2,
-                         multibyte_chars_in_text (p + 2, end - p - 2),
+                         multibyte_chars_in_text ((unsigned char *) p + 2,
+                                                  end - p - 2),
                          end - p - 2);
          /* Check skip_file so that when a function is defined several
             times in different files (typically, once in xterm, once in
@@ -685,10 +688,10 @@
 a new string, without any text properties, is returned.  */)
   (Lisp_Object string)
 {
-  unsigned char *buf;
+  char *buf;
   int changed = 0;
   register unsigned char *strp;
-  register unsigned char *bufp;
+  register char *bufp;
   EMACS_INT idx;
   EMACS_INT bsize;
   Lisp_Object tem;
@@ -721,7 +724,7 @@
     keymap = Voverriding_local_map;
 
   bsize = SBYTES (string);
-  bufp = buf = (unsigned char *) xmalloc (bsize);
+  bufp = buf = (char *) xmalloc (bsize);
 
   strp = SDATA (string);
   while (strp < SDATA (string) + SBYTES (string))
@@ -768,7 +771,7 @@
 
          /* Save STRP in IDX.  */
          idx = strp - SDATA (string);
-         name = Fintern (make_string (start, length_byte), Qnil);
+         name = Fintern (make_string ((char *) start, length_byte), Qnil);
 
        do_remap:
          tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qnil);
@@ -790,7 +793,7 @@
          if (NILP (tem))       /* but not on any keys */
            {
              EMACS_INT offset = bufp - buf;
-             buf = (unsigned char *) xrealloc (buf, bsize += 4);
+             buf = (char *) xrealloc (buf, bsize += 4);
              bufp = buf + offset;
              memcpy (bufp, "M-x ", 4);
              bufp += 4;
@@ -835,7 +838,7 @@
          /* Get the value of the keymap in TEM, or nil if undefined.
             Do this while still in the user's current buffer
             in case it is a local variable.  */
-         name = Fintern (make_string (start, length_byte), Qnil);
+         name = Fintern (make_string ((char *) start, length_byte), Qnil);
          tem = Fboundp (name);
          if (! NILP (tem))
            {
@@ -884,7 +887,7 @@
        subst:
          {
            EMACS_INT offset = bufp - buf;
-           buf = (unsigned char *) xrealloc (buf, bsize += length_byte);
+           buf = (char *) xrealloc (buf, bsize += length_byte);
            bufp = buf + offset;
            memcpy (bufp, start, length_byte);
            bufp += length_byte;