cpplib.c (my_strerror, [...]): Move to cpperror.c.

	* cpplib.c (my_strerror, cpp_error, cpp_error_with_line,
	cpp_error_from_errno, cpp_warning, cpp_warning_with_line,
	cpp_pedwarn, cpp_pedwarn_with_line,
	cpp_pedwarn_with_file_and_line): Move to cpperror.c.
	(cpp_print_file_and_line, v_cpp_error, v_cpp_warning,
	v_cpp_error_with_line, v_cpp_warning_with_line,
	cpp_message_from_errno, cpp_perror_with_name): Delete.

	* cpperror.c (cpp_print_containing_files): Take starting
	buffer as argument.
	(cpp_file_line_for_message): Rename to cpp_print_file_and_line.
	(v_cpp_message): Now called directly by all entry points.
	Remove -1 case.
	(cpp_pfatal_with_name, cpp_message): Delete.
	(cpp_notice_from_errno, cpp_ice): New functions.
	(cpp_notice): Is now for reporting error conditions, just
	without an associated file.
	(cpp_error, cpp_error_with_line): Don't do anything if
	opts->inhibit_errors is on.
	(cpp_pedwarn_with_file_and_line): Take column argument also.

	* cpplib.h: Update prototypes of exported functions.
	(struct cpp_options): Add inhibit_errors.

	* cppalloc.c, cppfiles.c: Use fprintf not cpp_notice for
	non-error messages.  Include intl.h.

	* cppinit.c, cppmain.c: Likewise.  Also, use
	cpp_notice_from_errno instead of cpp_perror_with_name or
	cpp_pfatal_with_name, and cpp_notice instead of cpp_message.

	* cppexp.c, cpphash.c, cppinit.c, cpplib.c: Use cpp_ice to
	report internal errors.

	* cpplib.c (do_define): Switch bcopy to memcpy.
	Give cpp_pedwarn_with_file_and_line a dummy column argument.

From-SVN: r31829

1 files changed, 3 insertions, 3 deletions

diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index 64491c5..9da1daa 100644
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -295,7 +295,7 @@ collect_expansion (pfile, buf, limit, nargs, arglist)
 
   if (limit < buf)
     {
-      cpp_fatal (pfile, "internal error: limit < buf in collect_expansion");
+      cpp_ice (pfile, "limit < buf in collect_expansion");
       limit = buf; /* treat it like a null defn */
     }
 
@@ -974,7 +974,7 @@ special_symbol (hp, pfile)
       break;
 
     default:
-      cpp_fatal (pfile, "cpplib internal error: invalid special hash type");
+      cpp_ice (pfile, "invalid special hash type");
       return;
     }
 }
@@ -1351,7 +1351,7 @@ macroexpand (pfile, hp)
 
 	  if (totlen > xbuf_len)
 	    {
-	      cpp_fatal (pfile, "internal_error: buffer overrun in macroexpand");
+	      cpp_ice (pfile, "buffer overrun in macroexpand");
 	      return;
 	    }
 	}