[pushed] Use metadata style in a few more places
Commit Message
The original change was created by Tom Tromey.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/739
......................................................................
Use metadata style in a few more places
I happened to find a few more spots that should use metadata style,
but do not. I missed these in my earlier search somehow. This patch
also adds gettext markup in a couple of spots where it was missing.
gdb/ChangeLog
2019-12-04 Tom Tromey <tom@tromey.com>
* valprint.c (val_print_string): Use metadata_style.
* go-valprint.c (print_go_string): Use metadata style.
* p-valprint.c (pascal_object_print_static_field): Use metadata
style.
* cp-valprint.c (cp_print_static_field): Use metadata style.
Change-Id: Id82ca2aa306c6694b111d5c92dfa6f0cce919ebf
---
M gdb/ChangeLog
M gdb/cp-valprint.c
M gdb/go-valprint.c
M gdb/p-valprint.c
M gdb/valprint.c
5 files changed, 24 insertions(+), 15 deletions(-)
@@ -1,3 +1,11 @@
+2019-12-04 Tom Tromey <tom@tromey.com>
+
+ * valprint.c (val_print_string): Use metadata_style.
+ * go-valprint.c (print_go_string): Use metadata style.
+ * p-valprint.c (pascal_object_print_static_field): Use metadata
+ style.
+ * cp-valprint.c (cp_print_static_field): Use metadata style.
+
2019-12-04 Andrew Burgess <andrew.burgess@embecosm.com>
Chris January <chris.january@arm.com>
@@ -638,9 +638,9 @@
{
if (value_address (val) == first_dont_print[i])
{
- fputs_filtered ("<same as static member of an already"
- " seen type>",
- stream);
+ fputs_styled (_("<same as static member of an already"
+ " seen type>"),
+ metadata_style.style (), stream);
return;
}
}
@@ -670,9 +670,9 @@
{
if (target_type == first_dont_print[i])
{
- fputs_filtered ("<same as static member of an already"
- " seen type>",
- stream);
+ fputs_styled (_("<same as static member of an already"
+ " seen type>"),
+ metadata_style.style (), stream);
return;
}
}
@@ -29,6 +29,7 @@
#include "go-lang.h"
#include "c-lang.h"
#include "valprint.h"
+#include "cli/cli-style.h"
/* Print a Go string.
@@ -71,9 +72,9 @@
if (length < 0)
{
- fputs_filtered (_("<invalid length: "), stream);
- fputs_filtered (plongest (addr), stream);
- fputs_filtered (">", stream);
+ printf_filtered (_("<invalid length: %ps>"),
+ styled_string (metadata_style.style (),
+ plongest (addr)));
return;
}
@@ -865,9 +865,9 @@
{
if (value_address (val) == first_dont_print[i])
{
- fputs_filtered ("\
-<same as static member of an already seen type>",
- stream);
+ fputs_styled (_("\
+<same as static member of an already seen type>"),
+ metadata_style.style (), stream);
return;
}
}
@@ -2897,9 +2897,9 @@
{
std::string str = memory_error_message (TARGET_XFER_E_IO, gdbarch, addr);
- fprintf_filtered (stream, "<error: ");
- fputs_filtered (str.c_str (), stream);
- fprintf_filtered (stream, ">");
+ fprintf_filtered (stream, _("<error: %ps>"),
+ styled_string (metadata_style.style (),
+ str.c_str ()));
}
return (bytes_read / width);