Simplify tui_show_registers

tui_show_registers keeps a local status variable, but it is not
actually needed.  This rearranges the function to remove the variable.

gdb/ChangeLog
2019-07-17  Tom Tromey  <tom@tromey.com>

	* tui/tui-regs.c (tui_show_registers): Simplify.
This commit is contained in:
Tom Tromey
2019-06-26 16:26:39 -06:00
parent e80cd20470
commit 368c1354e5
2 changed files with 10 additions and 11 deletions

View File

@ -1,3 +1,7 @@
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-regs.c (tui_show_registers): Simplify.
2019-07-17 Tom Tromey <tom@tromey.com> 2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-regs.c (tui_show_registers): Update. * tui/tui-regs.c (tui_show_registers): Update.

View File

@ -121,8 +121,6 @@ tui_data_window::first_reg_element_no_inline (int line_no) const
void void
tui_show_registers (struct reggroup *group) tui_show_registers (struct reggroup *group)
{ {
enum tui_status ret = TUI_FAILURE;
/* Make sure the curses mode is enabled. */ /* Make sure the curses mode is enabled. */
tui_enable (); tui_enable ();
@ -142,15 +140,7 @@ tui_show_registers (struct reggroup *group)
{ {
tui_show_register_group (TUI_DATA_WIN, group, get_selected_frame (NULL), tui_show_register_group (TUI_DATA_WIN, group, get_selected_frame (NULL),
group == TUI_DATA_WIN->current_group); group == TUI_DATA_WIN->current_group);
ret = TUI_SUCCESS;
}
if (ret == TUI_FAILURE)
{
TUI_DATA_WIN->current_group = 0;
TUI_DATA_WIN->erase_data_content (NO_REGS_STRING);
}
else
{
/* Clear all notation of changed values. */ /* Clear all notation of changed values. */
for (auto &&data_item_win : TUI_DATA_WIN->regs_content) for (auto &&data_item_win : TUI_DATA_WIN->regs_content)
{ {
@ -160,6 +150,11 @@ tui_show_registers (struct reggroup *group)
TUI_DATA_WIN->current_group = group; TUI_DATA_WIN->current_group = group;
TUI_DATA_WIN->display_all_data (); TUI_DATA_WIN->display_all_data ();
} }
else
{
TUI_DATA_WIN->current_group = 0;
TUI_DATA_WIN->erase_data_content (NO_REGS_STRING);
}
} }