* cpperror.c (print_location): Don't check for !pfile->buffer. That

	test fails following my 08-21 change, and it seems unnecessary anyway.
	(cpp_error):  Likewise.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 25c63ab..7d7193e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-27  Per Bothner  <pbothner@apple.com>
+
+       * cpperror.c (print_location):  Don't check for !pfile->buffer.  That
+       test fails following my 08-21 change, and it seems unnecessary anyway.
+       (cpp_error):  Likewise.
+
 2003-08-27  Jason Merrill  <jason@redhat.com>
 
        * real.c (do_multiply): Initialize with memset.
@@ -755,7 +761,7 @@ Wed Aug 20 12:08:55 CEST 2003  Jan Hubicka  <jh@suse.cz>
        * config/s390/s390.h: Prefix #include of s390/fixdfdi.h
        [under IN_LIBGCC2] with config/.
 
-2003-08-21  Per Bothner  <bothner@pbothner.com>
+2003-08-21  Per Bothner  <pbothner@apple.com>
 
        * cppfiles.c (stack_file):  Correctly pass return_at_eof parameter
        to cpp_push_buffer.

diff --git a/gcc/cpperror.c b/gcc/cpperror.c
index 4eed951..4926cb2 100644 (file)
--- a/gcc/cpperror.c
+++ b/gcc/cpperror.c
@@ -38,7 +38,7 @@ static void print_location (cpp_reader *, fileline, unsigned int);
 static void
 print_location (cpp_reader *pfile, fileline line, unsigned int col)
 {
-  if (!pfile->buffer || line == 0)
+  if (line == 0)
     fprintf (stderr, "%s: ", progname);
   else
     {
@@ -131,24 +131,19 @@ cpp_error (cpp_reader * pfile, int level, const char *msgid, ...)
   
   va_start (ap, msgid);
 
-  if (pfile->buffer)
+  if (CPP_OPTION (pfile, traditional))
     {
-      if (CPP_OPTION (pfile, traditional))
-       {
-         if (pfile->state.in_directive)
-           line = pfile->directive_line;
-         else
-           line = pfile->line;
-         column = 0;
-       }
+      if (pfile->state.in_directive)
+       line = pfile->directive_line;
       else
-       {
-         line = pfile->cur_token[-1].line;
-         column = pfile->cur_token[-1].col;
-       }
+       line = pfile->line;
+      column = 0;
     }
   else
-    line = column = 0;
+    {
+      line = pfile->cur_token[-1].line;
+      column = pfile->cur_token[-1].col;
+    }
 
   if (_cpp_begin_message (pfile, level, line, column))
     v_message (msgid, ap);