From patchwork Wed Dec 4 21:35:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36523 Received: (qmail 121125 invoked by alias); 4 Dec 2019 21:35:12 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 121109 invoked by uid 89); 4 Dec 2019 21:35:12 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 04 Dec 2019 21:35:10 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id E5E292039A; Wed, 4 Dec 2019 16:35:08 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 5CDA320172; Wed, 4 Dec 2019 16:35:07 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 2C31A2816F; Wed, 4 Dec 2019 16:35:07 -0500 (EST) X-Gerrit-PatchSet: 2 Date: Wed, 4 Dec 2019 16:35:06 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Tom Tromey , Andrew Burgess , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [pushed] Use metadata style in a few more places X-Gerrit-Change-Id: Id82ca2aa306c6694b111d5c92dfa6f0cce919ebf X-Gerrit-Change-Number: 739 X-Gerrit-ChangeURL: X-Gerrit-Commit: 2dbc041e4e9e7325de2794d11e9ef5a8c4f6b02d In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, tromey@sourceware.org, andrew.burgess@embecosm.com, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191204213507.2C31A2816F@gnutoolchain-gerrit.osci.io> 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 * 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(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 89b68b3..a8bafa3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-12-04 Tom Tromey + + * 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 Chris January diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index e445d42..0ec84f6 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -638,9 +638,9 @@ { if (value_address (val) == first_dont_print[i]) { - fputs_filtered ("", - stream); + fputs_styled (_(""), + metadata_style.style (), stream); return; } } @@ -670,9 +670,9 @@ { if (target_type == first_dont_print[i]) { - fputs_filtered ("", - stream); + fputs_styled (_(""), + metadata_style.style (), stream); return; } } diff --git a/gdb/go-valprint.c b/gdb/go-valprint.c index eda40f8..64761b9 100644 --- a/gdb/go-valprint.c +++ b/gdb/go-valprint.c @@ -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 (_("", stream); + printf_filtered (_(""), + styled_string (metadata_style.style (), + plongest (addr))); return; } diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c index e1e1a00..198d6b6 100644 --- a/gdb/p-valprint.c +++ b/gdb/p-valprint.c @@ -865,9 +865,9 @@ { if (value_address (val) == first_dont_print[i]) { - fputs_filtered ("\ -", - stream); + fputs_styled (_("\ +"), + metadata_style.style (), stream); return; } } diff --git a/gdb/valprint.c b/gdb/valprint.c index ced0dbc..1e3071b 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -2897,9 +2897,9 @@ { std::string str = memory_error_message (TARGET_XFER_E_IO, gdbarch, addr); - fprintf_filtered (stream, ""); + fprintf_filtered (stream, _(""), + styled_string (metadata_style.style (), + str.c_str ())); } return (bytes_read / width);