This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 2/3] gdb/tui: Define tui window names once.
- From: Andrew Burgess <andrew dot burgess at embecosm dot com>
- To: gdb-patches at sourceware dot org
- Cc: Andrew Burgess <andrew dot burgess at embecosm dot com>
- Date: Wed, 8 Jul 2015 21:37:29 +0100
- Subject: [PATCH 2/3] gdb/tui: Define tui window names once.
- Authentication-results: sourceware.org; auth=none
- References: <cover dot 1436387456 dot git dot andrew dot burgess at embecosm dot com>
- References: <cover dot 1436387456 dot git dot andrew dot burgess at embecosm dot com>
Don't duplicate the window names inside the completion function.
Instead make use of the existing defines, and the tui_win_name function
to obtain the window names.
gdb/ChangeLog:
* tui/tui-win.c (focus_completer): Don't duplicate the tui window
names in this function.
---
gdb/ChangeLog | 5 +++++
gdb/tui/tui-win.c | 27 +++++----------------------
2 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2e889e9..646bc5b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2015-07-06 Andrew Burgess <andrew.burgess@embecosm.com>
+ * tui/tui-win.c (focus_completer): Don't duplicate the tui window
+ names in this function.
+
+2015-07-06 Andrew Burgess <andrew.burgess@embecosm.com>
+
* tui/tui-data.h (SRC_NAME): Convert to lower case.
(CMD_NAME): Likewise.
(DATA_NAME): Likewise.
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 215a7f5..947608a 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -374,26 +374,9 @@ focus_completer (struct cmd_list_element *ignore,
|| !tui_win_list[win_type]->generic.is_visible)
continue;
- switch (win_type)
- {
- case SRC_WIN:
- completion_name = "src";
- break;
- case DISASSEM_WIN:
- completion_name = "asm";
- break;
- case DATA_WIN:
- completion_name = "regs";
- break;
- case CMD_WIN:
- completion_name = "cmd";
- break;
- default:
- break;
- }
-
- if (completion_name != NULL)
- VEC_safe_push (const_char_ptr, completion_name_vec, completion_name);
+ completion_name = tui_win_name (&tui_win_list [win_type]->generic);
+ gdb_assert (completion_name != NULL);
+ VEC_safe_push (const_char_ptr, completion_name_vec, completion_name);
}
/* If no windows are considered visible then the TUI has not yet been
@@ -402,8 +385,8 @@ focus_completer (struct cmd_list_element *ignore,
default layout to SRC_COMMAND. */
if (VEC_length (const_char_ptr, completion_name_vec) == 0)
{
- VEC_safe_push (const_char_ptr, completion_name_vec, "src");
- VEC_safe_push (const_char_ptr, completion_name_vec, "cmd");
+ VEC_safe_push (const_char_ptr, completion_name_vec, SRC_NAME);
+ VEC_safe_push (const_char_ptr, completion_name_vec, CMD_NAME);
}
VEC_safe_push (const_char_ptr, completion_name_vec, "next");
--
2.4.0