diff options
| author | Tom Tromey <tom@tromey.com> | 2019-06-30 20:32:35 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-07-17 12:19:14 -0600 |
| commit | 4e1e56b9818109a39bb1b035fd50dd05a00699f2 (patch) | |
| tree | 98756ae6b6bae2cd452ad88345e0dba8f71fde6f | |
| parent | 1e0c09ba0bdd8b4dd1ab3a61b2ae2d326825bee1 (diff) | |
| download | gdb-4e1e56b9818109a39bb1b035fd50dd05a00699f2.zip gdb-4e1e56b9818109a39bb1b035fd50dd05a00699f2.tar.gz gdb-4e1e56b9818109a39bb1b035fd50dd05a00699f2.tar.bz2 | |
Remove reset_locator
reset_locator was introduced just a few patches ago, but it's already
time to remove it. It consists of a call to the locator's "reset"
method, plus a call to tui_make_window; but the latter is redundant at
all the places that call reset_locator.
gdb/ChangeLog
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-layout.c (show_source_disasm_command, show_data):
Update.
(reset_locator): Remove.
(show_source_or_disasm_and_command): Update.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/tui/tui-layout.c | 39 |
2 files changed, 19 insertions, 27 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3de96b0..643ff23 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2019-07-17 Tom Tromey <tom@tromey.com> + * tui/tui-layout.c (show_source_disasm_command, show_data): + Update. + (reset_locator): Remove. + (show_source_or_disasm_and_command): Update. + +2019-07-17 Tom Tromey <tom@tromey.com> + * tui/tui-source.c (tui_source_window_base::reset): Remove win_type parameter. * tui/tui-layout.c (make_command_window, make_source_window) diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 79c7996..d15df2a 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -43,8 +43,6 @@ ** Static Local Decls ********************************/ static void show_layout (enum tui_layout_type); -static void reset_locator (tui_gen_win_info *, - int, int, int, int); static void show_source_or_disasm_and_command (enum tui_layout_type); static struct tui_win_info *make_command_window (int, int); static struct tui_win_info *make_source_window (int, int); @@ -611,11 +609,10 @@ show_source_disasm_command (void) { tui_win_list[DISASSEM_WIN] = make_disasm_window (asm_height, src_height - 1); - reset_locator (locator, - 2 /* 1 */ , - tui_term_width (), - 0, - (src_height + asm_height) - 1); + locator->reset (2 /* 1 */ , + tui_term_width (), + 0, + (src_height + asm_height) - 1); } else { @@ -688,11 +685,10 @@ show_data (enum tui_layout_type new_layout) else tui_win_list[win_type] = make_disasm_window (src_height, data_height - 1); - reset_locator (locator, - 2 /* 1 */ , - tui_term_width (), - 0, - total_height - 1); + locator->reset (2 /* 1 */ , + tui_term_width (), + 0, + total_height - 1); base = (tui_source_window_base *) tui_win_list[win_type]; } else @@ -736,16 +732,6 @@ tui_gen_win_info::reset (int height_, int width_, origin.y = origin_y_; } -static void -reset_locator (tui_gen_win_info *win_info, - int height, int width, - int origin_x, int origin_y) -{ - win_info->reset (height, width, origin_x, origin_y); - tui_make_window (win_info, DONT_BOX_WINDOW); -} - - /* Show the Source/Command or the Disassem layout. */ static void show_source_or_disasm_and_command (enum tui_layout_type layout_type) @@ -775,11 +761,10 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type) *win_info_ptr = make_source_window (src_height - 1, 0); else *win_info_ptr = make_disasm_window (src_height - 1, 0); - reset_locator (locator, - 2 /* 1 */ , - tui_term_width (), - 0, - src_height - 1); + locator->reset (2 /* 1 */ , + tui_term_width (), + 0, + src_height - 1); base = (tui_source_window_base *) *win_info_ptr; } else |