git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

diagnostic.h (output_clear_message_text): New function. 

* diagnostic.h (output_clear_message_text): New function.
	(output_message_text): New macro.

	* diagnostic.c (clear_text_info): Rename to
	output_clear_message_text.
	(output_clear): Adjust.
	(output_finish): Rename to output_finalize_message.  Tweek.
	(output_to_stream): Adjust.

From-SVN: r36658
This commit is contained in:
Gabriel Dos Reis 2000-09-28 12:50:37 +00:00 committed by Gabriel Dos Reis
parent 2d89ce6a8e
commit b5dd2c76f8
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2000-09-28 Gabriel Dos Reis <gdr@codesourcery.com>
* diagnostic.h (output_clear_message_text): New function.
(output_message_text): New macro.
* diagnostic.c (clear_text_info): Rename to
output_clear_message_text.
(output_clear): Adjust.
(output_finish): Rename to output_finalize_message. Tweek.
(output_to_stream): Adjust.
2000-09-28 Neil Booth <neilb@earthling.net> 2000-09-28 Neil Booth <neilb@earthling.net>
* cpperror.c (_cpp_begin_message): Do the test for suppression * cpperror.c (_cpp_begin_message): Do the test for suppression

15
gcc/diagnostic.c
View File

@ -93,7 +93,6 @@ static void output_append_r PARAMS ((output_buffer *, const char *, int));
static void wrap_text PARAMS ((output_buffer *, const char *, const char *)); static void wrap_text PARAMS ((output_buffer *, const char *, const char *));
static void maybe_wrap_text PARAMS ((output_buffer *, const char *, static void maybe_wrap_text PARAMS ((output_buffer *, const char *,
const char *)); const char *));
static void clear_text_info PARAMS ((output_buffer *));
static void clear_diagnostic_info PARAMS ((output_buffer *)); static void clear_diagnostic_info PARAMS ((output_buffer *));
static void default_diagnostic_starter PARAMS ((output_buffer *, static void default_diagnostic_starter PARAMS ((output_buffer *,
@ -303,8 +302,8 @@ output_destroy_prefix (buffer)
/* Zero out any text output so far in BUFFER. */ /* Zero out any text output so far in BUFFER. */
static void void
clear_text_info (buffer) output_clear_message_text (buffer)
output_buffer *buffer; output_buffer *buffer;
{ {
obstack_free (&buffer->obstack, obstack_base (&buffer->obstack)); obstack_free (&buffer->obstack, obstack_base (&buffer->obstack));
@ -367,7 +366,7 @@ void
output_clear (buffer) output_clear (buffer)
output_buffer *buffer; output_buffer *buffer;
{ {
clear_text_info (buffer); output_clear_message_text (buffer);
clear_diagnostic_info (buffer); clear_diagnostic_info (buffer);
} }
@ -375,11 +374,11 @@ output_clear (buffer)
the BUFFERed message. */ the BUFFERed message. */
const char * const char *
output_finish (buffer) output_finalize_message (buffer)
output_buffer *buffer; output_buffer *buffer;
{ {
obstack_1grow (&buffer->obstack, '\0'); obstack_1grow (&buffer->obstack, '\0');
return (const char *) obstack_finish (&buffer->obstack); return output_message_text (buffer);
} }
void void
@ -652,9 +651,9 @@ output_to_stream (buffer, file)
output_buffer *buffer; output_buffer *buffer;
FILE *file; FILE *file;
{ {
const char *text = output_finish (buffer); const char *text = output_finalize_message (buffer);
fputs (text, file); fputs (text, file);
clear_text_info (buffer); output_clear_message_text (buffer);
} }
/* Format a message pointed to by output_buffer_text_cursor (BUFFER) using /* Format a message pointed to by output_buffer_text_cursor (BUFFER) using

5
gcc/diagnostic.h
View File

@ -93,6 +93,8 @@ struct output_buffer
#define output_needs_newline(BUFFER) (BUFFER)->state.need_newline_p #define output_needs_newline(BUFFER) (BUFFER)->state.need_newline_p
#define output_buffer_state(BUFFER) (BUFFER)->state #define output_buffer_state(BUFFER) (BUFFER)->state
#define output_indentation(BUFFER) (BUFFER)->state.indent_skip #define output_indentation(BUFFER) (BUFFER)->state.indent_skip
#define output_message_text(BUFFER) \
((const char *) obstack_base (&(BUFFER)->obstack))
/* This data structure bundles altogether any information relevent to /* This data structure bundles altogether any information relevent to
the context of a diagnostic message. */ the context of a diagnostic message. */
@ -189,7 +191,8 @@ void output_append PARAMS ((output_buffer *, const char *,
void output_add_character PARAMS ((output_buffer *, int)); void output_add_character PARAMS ((output_buffer *, int));
void output_decimal PARAMS ((output_buffer *, int)); void output_decimal PARAMS ((output_buffer *, int));
void output_add_string PARAMS ((output_buffer *, const char *)); void output_add_string PARAMS ((output_buffer *, const char *));
const char *output_finish PARAMS ((output_buffer *)); const char *output_finalize_message PARAMS ((output_buffer *));
void output_clear_message_text PARAMS ((output_buffer *));
void output_printf PARAMS ((output_buffer *, const char *, void output_printf PARAMS ((output_buffer *, const char *,
...)) ATTRIBUTE_PRINTF_2; ...)) ATTRIBUTE_PRINTF_2;
int output_is_line_wrapping PARAMS ((output_buffer *)); int output_is_line_wrapping PARAMS ((output_buffer *));