[PATCH 52/66] Remove command from tui_which_element

Tom Tromey
2019-06-24T18:48:55Z

union tui_which_element has a "command" member, but it is never used.
This removes it.

2019-06-23 Tom Tromey <tom@tromey.com>

* tui/tui-data.h (struct tui_command_element): Remove.
(union tui_which_element) <command>: Remove.
* tui/tui-data.c (init_content_element): Remove CMD_WIN case. Add
assert.
(free_content_elements): Remove CMD_WIN case.
---
gdb/ChangeLog | 8 ++++++++
gdb/tui/tui-data.c | 7 +------
gdb/tui/tui-data.h | 7 -------
3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index f6d36e670fb..b6d1b9913d3 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -366,6 +366,7 @@ init_content_element (struct tui_win_element *element,
{
gdb_assert (type != EXEC_INFO_WIN);
gdb_assert (type != LOCATOR_WIN);
+ gdb_assert (type != CMD_WIN);

switch (type)
{
@@ -383,9 +384,6 @@ init_content_element (struct tui_win_element *element,
tui_alloc_content (1, DATA_ITEM_WIN);
element->which_element.data_window->content_size = 1;
break;
- case CMD_WIN:
- element->which_element.command.line = NULL;
- break;
case DATA_ITEM_WIN:
element->which_element.data.name = NULL;
element->which_element.data.type = TUI_REGISTER;
@@ -627,9 +625,6 @@ free_content_elements (tui_win_content content,
xfree (element->which_element.data.content);
xfree (element);
break;
- case CMD_WIN:
- xfree (element->which_element.command.line);
- break;
default:
break;
}
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 922f1301fa4..5f58b109e96 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -201,12 +201,6 @@ struct tui_data_element
};

-/* Elements in the command window content. */
-struct tui_command_element
-{
- char *line;
-};
-
#ifdef PATH_MAX
# define MAX_LOCATOR_ELEMENT_LEN PATH_MAX
#else
@@ -234,7 +228,6 @@ union tui_which_element
struct tui_source_element source; /* The source elements. */
struct tui_gen_win_info *data_window; /* Data display elements. */
struct tui_data_element data; /* Elements of data_window. */
- struct tui_command_element command; /* Command elements. */
};

struct tui_win_element
--
2.17.2