From: Andrew Burgess <andrew.burgess@embecosm.com>
To: gdb-patches@sourceware.org
Cc: Andrew Burgess <andrew.burgess@embecosm.com>
Subject: [PATCH 3/4] gdb: Don't call tui_enable too early.
Date: Wed, 20 May 2015 23:18:00 -0000 [thread overview]
Message-ID: <fd863876cb080ba9426f564f5539b97b3a0a8eee.1432163460.git.andrew.burgess@embecosm.com> (raw)
In-Reply-To: <cover.1432163460.git.andrew.burgess@embecosm.com>
In-Reply-To: <cover.1432163460.git.andrew.burgess@embecosm.com>
Calling tui_enable too early in tui_layout_command can leave the tui in
an enabled state if the user has entered an invalid layout name.
Instead postpone the call to tui_enable until later in
tui_set_layout_for_display_command just before the layout is changed.
gdb/ChangeLog:
* tui/tui-layout.c (tui_layout_command): Move call to tui_enable
into ...
(tui_set_layout_for_display_command): ...here, before calling
tui_set_layout. Only set the layout if gdb has not already
entered the TUI_FAILURE state.
---
gdb/ChangeLog | 8 ++++++++
gdb/tui/tui-layout.c | 10 ++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51d2bfc..8ea1a5e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
2015-05-20 Andrew Burgess <andrew.burgess@embecosm.com>
+ * tui/tui-layout.c (tui_layout_command): Move call to tui_enable
+ into ...
+ (tui_set_layout_for_display_command): ...here, before calling
+ tui_set_layout. Only set the layout if gdb has not already
+ entered the TUI_FAILURE state.
+
+2015-05-20 Andrew Burgess <andrew.burgess@embecosm.com>
+
* tui/tui-layout.c (layout_completer): New function.
(_initialize_tui_layout): Set completer on layout command.
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 45fa575..2e950f7 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -460,7 +460,12 @@ tui_set_layout_for_display_command (const char *layout_name)
else
status = TUI_FAILURE;
- tui_set_layout (new_layout);
+ if (status == TUI_SUCCESS)
+ {
+ /* Make sure the curses mode is enabled. */
+ tui_enable ();
+ tui_set_layout (new_layout);
+ }
}
xfree (buf_ptr);
}
@@ -509,9 +514,6 @@ extract_display_start_addr (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p)
static void
tui_layout_command (char *arg, int from_tty)
{
- /* Make sure the curses mode is enabled. */
- tui_enable ();
-
/* Switch to the selected layout. */
if (tui_set_layout_for_display_command (arg) != TUI_SUCCESS)
warning (_("Invalid layout specified.\n%s"), LAYOUT_USAGE);
--
2.4.0
next prev parent reply other threads:[~2015-05-20 23:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 23:17 [PATCH 0/4] layout command changes Andrew Burgess
2015-05-20 23:18 ` [PATCH 4/4] gdb: Add cleanup to avoid memory leak on error Andrew Burgess
2015-05-20 23:18 ` [PATCH 2/4] gdb: Add completer for layout command Andrew Burgess
2015-05-21 0:25 ` Keith Seitz
2015-05-21 7:10 ` Andrew Burgess
2015-05-20 23:18 ` [PATCH 1/4] gdb: Remove register class specific layout names Andrew Burgess
2015-05-21 8:42 ` Pedro Alves
2015-05-21 11:33 ` Andrew Burgess
2015-05-21 11:34 ` Pedro Alves
2015-05-21 12:25 ` Andrew Burgess
2015-05-21 13:17 ` Pedro Alves
2015-05-20 23:18 ` Andrew Burgess [this message]
2015-05-21 8:12 ` [PATCH 0/4] layout command changes Pedro Alves
2015-05-21 8:35 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fd863876cb080ba9426f564f5539b97b3a0a8eee.1432163460.git.andrew.burgess@embecosm.com \
--to=andrew.burgess@embecosm.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).