aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-06-21 06:16:06 -0600
committerTom Tromey <tom@tromey.com>2019-06-25 07:48:46 -0600
commitdd835f8b70a2dfb4d8b84a4744606a9c922aeb25 (patch)
treed7c0fc5b399208cdc5c3536a42849c5cf5c1bf6f
parentbd7db367c4bc72bef9c7848b99aaaa1431cf1672 (diff)
downloadgdb-dd835f8b70a2dfb4d8b84a4744606a9c922aeb25.zip
gdb-dd835f8b70a2dfb4d8b84a4744606a9c922aeb25.tar.gz
gdb-dd835f8b70a2dfb4d8b84a4744606a9c922aeb25.tar.bz2
Remove command from tui_which_element
union tui_which_element has a "command" member, but it is never used. This removes it. gdb/ChangeLog 2019-06-25 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.
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/tui/tui-data.c7
-rw-r--r--gdb/tui/tui-data.h7
3 files changed, 9 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b0e0547..9c6cf68 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
2019-06-25 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.
+
+2019-06-25 Tom Tromey <tom@tromey.com>
+
* tui/tui-layout.c (tui_set_layout): Update.
* tui/tui-data.h (struct tui_layout_def) <split>: Remove.
* tui/tui-data.c (layout_def): Update.
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 2c1e575..427f04a 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 0990a2d..5c1f2bd 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