OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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.

From-SVN: r70874
This commit is contained in:
Per Bothner 2003-08-28 00:21:34 +00:00 committed by Per Bothner
parent a66e04e38c
commit 75ee800b5e
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -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.

25
gcc/cpperror.c
View File

@ -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);