From 46f438e3d57bae1d74ab9a7e6cba380b0e58f552 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 6 Jul 2019 17:30:02 -0600 Subject: [PATCH] Remove tui_initialize_static_data tui_initialize_static_data is not needed, because locator moving and resizing is already handled in the layout code. gdb/ChangeLog 2019-08-15 Tom Tromey * tui/tui-stack.c (tui_initialize_static_data): Remove. * tui/tui-interp.c (tui_interp::init): Don't call tui_initialize_static_data. * tui/tui-data.h (tui_initialize_static_data): Don't declare. --- gdb/ChangeLog | 7 +++++++ gdb/tui/tui-data.h | 1 - gdb/tui/tui-interp.c | 2 -- gdb/tui/tui-stack.c | 15 --------------- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7e7c8a8320..f7ed59efcf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2019-08-15 Tom Tromey + + * tui/tui-stack.c (tui_initialize_static_data): Remove. + * tui/tui-interp.c (tui_interp::init): Don't call + tui_initialize_static_data. + * tui/tui-data.h (tui_initialize_static_data): Don't declare. + 2019-08-15 Tom Tromey * tui/tui-layout.c (tui_default_win_viewport_height): Don't diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index b5eeecdee9..eaf3e061dc 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -317,7 +317,6 @@ struct all_tui_windows /* Data Manipulation Functions. */ -extern void tui_initialize_static_data (void); extern struct tui_win_info *tui_partial_win_by_name (const char *); extern enum tui_layout_type tui_current_layout (void); extern int tui_term_height (void); diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c index d1146fed0e..ea562acb6c 100644 --- a/gdb/tui/tui-interp.c +++ b/gdb/tui/tui-interp.c @@ -242,8 +242,6 @@ tui_interp::init (bool top_level) /* Install exit handler to leave the screen in a good shape. */ atexit (tui_exit); - tui_initialize_static_data (); - tui_initialize_io (); tui_initialize_win (); if (ui_file_isatty (gdb_stdout)) diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index f61aa52600..f4d6d3865e 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -66,21 +66,6 @@ tui_locator_win_info_ptr (void) return &_locator; } -void -tui_initialize_static_data () -{ - tui_gen_win_info *win = tui_locator_win_info_ptr (); - win->width = - win->height = - win->origin.x = - win->origin.y = - win->viewport_height = 0; - win->handle = NULL; - win->is_visible = false; - win->title = 0; -} - - /* Create the status line to display as much information as we can on this single line: target name, process number, current function, current line, current PC, SingleKey mode. */ -- 2.34.1