This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 1/4] windows-nat: Trim a trailing '\n's from OutputDebugString before echoing it
- From: Jon Turney <jon dot turney at dronecode dot org dot uk>
- To: gdb-patches at sourceware dot org
- Cc: Jon Turney <jon dot turney at dronecode dot org dot uk>
- Date: Wed, 3 Jun 2015 18:29:49 +0100
- Subject: [PATCH 1/4] windows-nat: Trim a trailing '\n's from OutputDebugString before echoing it
- Authentication-results: sourceware.org; auth=none
- References: <1433352592-9728-1-git-send-email-jon dot turney at dronecode dot org dot 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 <jon.turney@dronecode.org.uk>
* windows-nat.c (handle_output_debug_string): Trim trailing '\n'
from OutputDebugString.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
---
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 <jon.turney@dronecode.org.uk>
+
+ * windows-nat.c (handle_output_debug_string): Trim trailing '\n'
+ from OutputDebugString.
+
2015-06-02 Simon Marchi <simon.marchi@ericsson.com>
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
--
2.1.4