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  <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/ChangeLog b/gdb/ChangeLog
index dd31fb63b58b314be201468bde8849dafb02509f..b0e0547d69f213b22dd5415e7b0251f91f736cb1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2019-06-25  Tom Tromey  <tom@tromey.com>
 
        * tui/tui-wingeneral.c (tui_refresh_all): Update.

diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 3da269b248da2f3e57dfd6d4a761eb20fe4abe5c..2c1e575dc4885191d8fc56a4c503ddae2eb881eb 100644 (file)
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -41,7 +41,7 @@ static std::vector<tui_source_window_base *> 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 f29891c8a02f90957f5f3cb3ccbe7f565f3c63b3..0990a2d169007b1ff5896db934c8a0a1563cdd35 100644 (file)
--- 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 cf8f13feeed019e3b885fb6d29c124a3c8f5948a..61be48b877f44f7b39b59d61eb11e0e44e96a45d 100644 (file)
--- 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;