From patchwork Wed Jun 3 17:29:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Turney X-Patchwork-Id: 7029 Received: (qmail 71403 invoked by alias); 3 Jun 2015 17:30:35 -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 71333 invoked by uid 89); 3 Jun 2015 17:30:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.0 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.2 X-HELO: rgout0501.bt.lon5.cpcloud.co.uk Received: from rgout0501.bt.lon5.cpcloud.co.uk (HELO rgout0501.bt.lon5.cpcloud.co.uk) (65.20.0.222) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 03 Jun 2015 17:30:32 +0000 X-OWM-Source-IP: 31.51.205.195(GB) X-OWM-Env-Sender: jonturney@btinternet.com X-CTCH-RefID: str=0001.0A090201.556F39B7.006F, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-Junkmail-Premium-Raw: score=27/50, refid=2.7.2:2015.6.2.124816:17:27.888, ip=31.51.205.195, rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __ANY_URI, __URI_NO_WWW, __URI_NO_PATH, BODY_SIZE_1300_1399, BODYTEXTP_SIZE_3000_LESS, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, __URI_NS, SXL_IP_DYNAMIC[195.205.51.31.fur], HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, RDNS_SUSP_GENERIC, RDNS_SUSP, BODY_SIZE_2000_LESS, BODY_SIZE_7000_LESS, REFERENCES X-CTCH-Spam: Unknown Received: from localhost.localdomain (31.51.205.195) by rgout05.bt.lon5.cpcloud.co.uk (8.6.122.06) (authenticated as jonturney@btinternet.com) id 556DA854008F26A0; Wed, 3 Jun 2015 18:30:23 +0100 From: Jon Turney To: gdb-patches@sourceware.org Cc: Jon Turney Subject: [PATCH 1/4] windows-nat: Trim a trailing '\n' from OutputDebugString before echoing it Date: Wed, 3 Jun 2015 18:29:48 +0100 Message-Id: <1433352592-9728-2-git-send-email-jon.turney@dronecode.org.uk> In-Reply-To: <1433352592-9728-1-git-send-email-jon.turney@dronecode.org.uk> References: <1433352592-9728-1-git-send-email-jon.turney@dronecode.org.uk> For cosmetic purposes, trim a trailing '\n' from OutputDebugString before echoing it, as warning() will add a '\n', anyhow. gdb/ChangeLog: 2015-06-03 Jon Turney * windows-nat.c (handle_output_debug_string): Trim trailing '\n' from OutputDebugString. Signed-off-by: Jon Turney --- gdb/ChangeLog | 5 +++++ gdb/windows-nat.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 37d619b..ee9f1df 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-06-03 Jon Turney + + * windows-nat.c (handle_output_debug_string): Trim trailing '\n' + from OutputDebugString. + 2015-06-02 Simon Marchi PR gdb/15564 diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 701d2c5..b56b916 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -818,7 +818,12 @@ handle_output_debug_string (struct target_waitstatus *ourstatus) #ifdef __CYGWIN__ if (!startswith (s, "cYg")) #endif - warning (("%s"), s); + { + char *p = strchr (s, '\0'); + if (p > s && *--p == '\n') + *p = '\0'; + warning (("%s"), s); + } } #ifdef __COPY_CONTEXT_SIZE else