From bd7db367c4bc72bef9c7848b99aaaa1431cf1672 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 21 Jun 2019 06:12:48 -0600 Subject: [PATCH] Remove layout_def::split The "split" field in struct layout_def is never used, so this patch removes it. gdb/ChangeLog 2019-06-25 Tom Tromey * tui/tui-layout.c (tui_set_layout): Update. * tui/tui-data.h (struct tui_layout_def) : Remove. * tui/tui-data.c (layout_def): Update. --- gdb/ChangeLog | 6 ++++++ gdb/tui/tui-data.c | 2 +- gdb/tui/tui-data.h | 1 - gdb/tui/tui-layout.c | 5 ----- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dd31fb6..b0e0547 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2019-06-25 Tom Tromey + * tui/tui-layout.c (tui_set_layout): Update. + * tui/tui-data.h (struct tui_layout_def) : Remove. + * tui/tui-data.c (layout_def): Update. + +2019-06-25 Tom Tromey + * tui/tui-wingeneral.c (tui_refresh_all): Update. * tui/tui-win.c (tui_resize_all, tui_adjust_win_heights) (tui_source_window_base::set_new_height): Update. diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 3da269b..2c1e575 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -41,7 +41,7 @@ static std::vector source_windows; static struct tui_win_info *win_with_focus = NULL; static struct tui_layout_def layout_def = { SRC_WIN, /* DISPLAY_MODE */ - FALSE}; /* SPLIT */ +}; static int win_resized = FALSE; diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index f29891c..0990a2d 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -176,7 +176,6 @@ struct tui_line_or_address struct tui_layout_def { enum tui_win_type display_mode; - int split; }; /* Elements in the Source/Disassembly Window. */ diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index cf8f13f..61be48b 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -154,7 +154,6 @@ tui_set_layout (enum tui_layout_type layout_type) case SRC_COMMAND: tui_set_win_focus_to (TUI_SRC_WIN); layout_def->display_mode = SRC_WIN; - layout_def->split = FALSE; break; case DISASSEM_COMMAND: /* The previous layout was not showing code. @@ -168,7 +167,6 @@ tui_set_layout (enum tui_layout_type layout_type) tui_get_begin_asm_address (&gdbarch, &addr); tui_set_win_focus_to (TUI_DISASM_WIN); layout_def->display_mode = DISASSEM_WIN; - layout_def->split = FALSE; break; case SRC_DISASSEM_COMMAND: /* The previous layout was not showing code. @@ -184,7 +182,6 @@ tui_set_layout (enum tui_layout_type layout_type) tui_set_win_focus_to (TUI_SRC_WIN); else tui_set_win_focus_to (TUI_DISASM_WIN); - layout_def->split = TRUE; break; case SRC_DATA_COMMAND: if (win_with_focus != TUI_DATA_WIN) @@ -192,7 +189,6 @@ tui_set_layout (enum tui_layout_type layout_type) else tui_set_win_focus_to (TUI_DATA_WIN); layout_def->display_mode = SRC_WIN; - layout_def->split = FALSE; break; case DISASSEM_DATA_COMMAND: /* The previous layout was not showing code. @@ -209,7 +205,6 @@ tui_set_layout (enum tui_layout_type layout_type) else tui_set_win_focus_to (TUI_DATA_WIN); layout_def->display_mode = DISASSEM_WIN; - layout_def->split = FALSE; break; default: break; -- 2.7.4