1999-10-15 11:16 -0700 Zack Weinberg <zack@bitmover.com>

	* cppexp.c (cpp_parse_escape): Make static.  Change second arg
	to U_CHAR **.
	(parse_charconst): Delete unnecessary cast when calling
	cpp_parse_escape.
	(cpplib.h): Kill prototype of cpp_parse_escape.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30022 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a9ba846..6e4038c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+1999-10-15 11:16 -0700  Zack Weinberg  <zack@bitmover.com>
+
+       * cppexp.c (cpp_parse_escape): Make static.  Change second arg
+       to U_CHAR **.
+       (parse_charconst): Delete unnecessary cast when calling
+       cpp_parse_escape.
+       (cpplib.h): Kill prototype of cpp_parse_escape.
+
 Fri Oct 15 11:02:46 1999  Richard Henderson  <rth@cygnus.com>
 
        Based on patch from Michael Gschwind <mikeg@watson.ibm.com>:

diff --git a/gcc/cppexp.c b/gcc/cppexp.c
index f037924..5d50c75 100644 (file)
--- a/gcc/cppexp.c
+++ b/gcc/cppexp.c
@@ -84,6 +84,7 @@ static struct operation parse_number PARAMS ((cpp_reader *, U_CHAR *, U_CHAR *))
 static struct operation parse_charconst PARAMS ((cpp_reader *, U_CHAR *, U_CHAR *));
 static struct operation cpp_lex PARAMS ((cpp_reader *, int));
 extern HOST_WIDEST_INT cpp_parse_expr PARAMS ((cpp_reader *));
+static HOST_WIDEST_INT cpp_parse_escape PARAMS ((cpp_reader *, U_CHAR **, HOST_WIDEST_INT));
 
 #define ERROR 299
 #define OROR 300
@@ -291,7 +292,7 @@ parse_charconst (pfile, start, end)
             an unshifted multibyte char, so cpp_parse_escape doesn't
             need to know about multibyte chars.  */
 
-         c = cpp_parse_escape (pfile, (char **) &ptr, mask);
+         c = cpp_parse_escape (pfile, &ptr, mask);
          if (width < HOST_BITS_PER_INT
              && (unsigned int) c >= (unsigned int)(1 << width))
            cpp_pedwarn (pfile, "escape sequence out of range for character");
@@ -522,10 +523,10 @@ cpp_lex (pfile, skip_evaluation)
    If \ is followed by 000, we return 0 and leave the string pointer
    after the zeros.  A value of 0 does not mean end of string.  */
 
-HOST_WIDEST_INT
+static HOST_WIDEST_INT
 cpp_parse_escape (pfile, string_ptr, result_mask)
      cpp_reader *pfile;
-     char **string_ptr;
+     U_CHAR **string_ptr;
      HOST_WIDEST_INT result_mask;
 {
   register int c = *(*string_ptr)++;

diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index 765daa1..3880f2c 100644 (file)
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -721,7 +721,6 @@ extern void cpp_perror_with_name PROTO ((cpp_reader *, const char *));
 extern void v_cpp_message PROTO ((cpp_reader *, int, const char *, va_list));
 
 extern void cpp_grow_buffer PARAMS ((cpp_reader *, long));
-extern HOST_WIDEST_INT cpp_parse_escape PARAMS ((cpp_reader *, char **, HOST_WIDEST_INT));
 extern cpp_buffer *cpp_push_buffer PARAMS ((cpp_reader *,
                                            unsigned char *, long));
 extern cpp_buffer *cpp_pop_buffer PARAMS ((cpp_reader *));