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

[Paul Eggert]

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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-07 01:24:53 +0000
+++ b/src/ChangeLog     2011-02-07 01:31:29 +0000
@@ -6,6 +6,7 @@
        Change types between char * and unsigned char *, to satisfy C89
        rules about pointer type compatibility.
        * casefiddle.c (casify_object, casify_region): Likewise.
+       * search.c (Freplace_match, Fregexp_quote): Likewise.
 
 2011-02-06  Paul Eggert  <address@hidden>
 

=== modified file 'src/search.c'
--- a/src/search.c      2011-01-30 22:17:44 +0000
+++ b/src/search.c      2011-02-07 01:31:29 +0000
@@ -2705,7 +2705,7 @@
                    idx = c - '0';
                }
              else if (c == '\\')
-               add_len = 1, add_stuff = "\\";
+               add_len = 1, add_stuff = (unsigned char *) "\\";
              else
                {
                  xfree (substed);
@@ -2755,10 +2755,11 @@
              EMACS_INT nchars =
                multibyte_chars_in_text (substed, substed_len);
 
-             newtext = make_multibyte_string (substed, nchars, substed_len);
+             newtext = make_multibyte_string ((char *) substed, nchars,
+                                              substed_len);
            }
          else
-           newtext = make_unibyte_string (substed, substed_len);
+           newtext = make_unibyte_string ((char *) substed, substed_len);
        }
       xfree (substed);
     }
@@ -3145,17 +3146,17 @@
        doc: /* Return a regexp string which matches exactly STRING and nothing 
else.  */)
   (Lisp_Object string)
 {
-  register unsigned char *in, *out, *end;
-  register unsigned char *temp;
+  register char *in, *out, *end;
+  register char *temp;
   int backslashes_added = 0;
 
   CHECK_STRING (string);
 
-  temp = (unsigned char *) alloca (SBYTES (string) * 2);
+  temp = (char *) alloca (SBYTES (string) * 2);
 
   /* Now copy the data into the new string, inserting escapes. */
 
-  in = SDATA (string);
+  in = SSDATA (string);
   end = in + SBYTES (string);
   out = temp;