summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4>2000-08-23 09:31:12 +0000
committergdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4>2000-08-23 09:31:12 +0000
commit662821ccd0943292aad10ba81e14006caaa5eceb (patch)
tree8890923727ee9f077169281ebb46f79bcc1e2e0f
parent2fb1054743c24e2abf9f4184ff79e439bbfd370e (diff)
downloadgcc-662821ccd0943292aad10ba81e14006caaa5eceb.tar.gz
* error.c (cp_print_error_function): Don't use embedded '\n' in
output_printf. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35906 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/error.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8ddd8a03f42..174263e74f3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
2000-08-23 Gabriel Dos Reis <gdr@codesourcery.com>
+ * error.c (cp_print_error_function): Don't use embedded '\n' in
+ output_printf.
+
+2000-08-23 Gabriel Dos Reis <gdr@codesourcery.com>
+
* decl.c (init_decl_processing): Remove bogus initialization.
* error.c (lang_print_error_function): Restore here.
(init_error): Initialize print_error_function.
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 012bbcf6aee..4329de5e876 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2486,14 +2486,12 @@ cp_print_error_function (buffer, dc)
output_set_prefix (buffer, prefix);
if (current_function_decl == NULL)
- {
- output_add_string (buffer, "At global scope:");
- output_add_newline (buffer);
- }
+ output_add_string (buffer, "At global scope:");
else
output_printf
- (buffer, "In %s `%s':\n", function_category (current_function_decl),
+ (buffer, "In %s `%s':", function_category (current_function_decl),
(*decl_printable_name) (current_function_decl, 2));
+ output_add_newline (buffer);
record_last_error_function ();
output_destroy_prefix (buffer);