[PATCH 1/3] gdb: Don't print a newline in language la_print_typedef methods

Andrew Burgess
2019-09-26T23:09:46Z

When calling the language la_print_typedef method, don't include a
newline at the end, instead print the newline from the users of
la_print_typedef.

This change will be useful in a later commit when the output from
la_print_typedef will be placed into an MI output field, in which case
the trailing newline is not required.

There should be no user visible changes after this commit.

gdb/ChangeLog:

* ada-typeprint.c (ada_print_typedef): Don't print newline at the
end.
* c-typeprint.c (c_print_typedef): Likewise.
* f-typeprint.c (f_print_typedef): Likewise.
* m2-typeprint.c (m2_print_typedef): Likewise.
* p-typeprint.c (pascal_print_typedef): Likewise.
* rust-lang.c (rust_print_typedef): Likewise.
* symtab.c (print_symbol_info): Print a newline after calling
typedef_print.
---
gdb/ChangeLog | 12 ++++++++++++
gdb/ada-typeprint.c | 1 -
gdb/c-typeprint.c | 2 +-
gdb/f-typeprint.c | 1 -
gdb/m2-typeprint.c | 2 +-
gdb/p-typeprint.c | 2 +-
gdb/rust-lang.c | 2 +-
gdb/symtab.c | 6 ++----
8 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 89a69e9bd44..f14a41fe835 100644
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -951,5 +951,4 @@ ada_print_typedef (struct type *type, struct symbol *new_symbol,
{
type = ada_check_typedef (type);
ada_print_type (type, "", stream, 0, 0, &type_print_raw_options);
- fprintf_filtered (stream, "\n");
}
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 43ad3b3e0e6..c89acd4a7cd 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -211,7 +211,7 @@ c_print_typedef (struct type *type,
SYMBOL_LINKAGE_NAME (new_symbol)) != 0
|| TYPE_CODE (SYMBOL_TYPE (new_symbol)) == TYPE_CODE_TYPEDEF)
fprintf_filtered (stream, " %s", SYMBOL_PRINT_NAME (new_symbol));
- fprintf_filtered (stream, ";\n");
+ fprintf_filtered (stream, ";");
}

/* If TYPE is a derived type, then print out derivation information.
diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 92b50938740..f7813d660ca 100644
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -53,7 +53,6 @@ f_print_typedef (struct type *type, struct symbol *new_symbol,
{
type = check_typedef (type);
f_print_type (type, "", stream, 0, 0, &type_print_raw_options);
- fprintf_filtered (stream, "\n");
}

/* LEVEL is the depth to indent lines by. */
diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index dae07d1c531..968d02a76a1 100644
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -169,7 +169,7 @@ m2_print_typedef (struct type *type, struct symbol *new_symbol,
else
fprintf_filtered (stream, "<builtin> = ");
type_print (type, "", stream, 0);
- fprintf_filtered (stream, ";\n");
+ fprintf_filtered (stream, ";");
}

/* m2_type_name - if a, type, has a name then print it. */
diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index d90b8ceb6ea..504ba477f91 100644
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -100,7 +100,7 @@ pascal_print_typedef (struct type *type, struct symbol *new_symbol,
fprintf_filtered (stream, "type ");
fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new_symbol));
type_print (type, "", stream, 0);
- fprintf_filtered (stream, ";\n");
+ fprintf_filtered (stream, ";");
}

/* If TYPE is a derived type, then print out derivation information.
diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index 79f13311cd8..518c667345a 100644
--- a/gdb/rust-lang.c
+++ b/gdb/rust-lang.c
@@ -828,7 +828,7 @@ rust_print_typedef (struct type *type,
type = check_typedef (type);
fprintf_filtered (stream, "type %s = ", SYMBOL_PRINT_NAME (new_symbol));
type_print (type, "", stream, 0);
- fprintf_filtered (stream, ";\n");
+ fprintf_filtered (stream, ";");
}

/* la_print_type implementation for Rust. */
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 6ea9fc6971e..b4316479f53 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -4777,10 +4777,8 @@ print_symbol_info (enum search_domain kind,
if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_TYPEDEF)
typedef_print (SYMBOL_TYPE (sym), sym, gdb_stdout);
else
- {
- type_print (SYMBOL_TYPE (sym), "", gdb_stdout, -1);
- printf_filtered ("\n");
- }
+ type_print (SYMBOL_TYPE (sym), "", gdb_stdout, -1);
+ printf_filtered ("\n");
}
/* variable, func, or typedef-that-is-c++-class. */
else if (kind < TYPES_DOMAIN
--
2.14.5