[18/61] Simplify tui_show_registers

Message ID 20190704170311.15982-19-tom@tromey.com
State New
Headers show
Series
  • More TUI refactorings
Related show

Commit Message

Tom Tromey July 4, 2019, 5:02 p.m.
tui_show_registers keeps a local status variable, but it is not
actually needed.  This rearranges the function to remove the variable.

2019-07-04  Tom Tromey  <tom@tromey.com>

	* tui/tui-regs.c (tui_show_registers): Simplify.
---
 gdb/ChangeLog      |  4 ++++
 gdb/tui/tui-regs.c | 17 ++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

-- 
2.17.2

Patch

diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index f99e7c12f7f..931787ae4b5 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -121,8 +121,6 @@  tui_data_window::first_reg_element_no_inline (int line_no) const
 void
 tui_show_registers (struct reggroup *group)
 {
-  enum tui_status ret = TUI_FAILURE;
-
   /* Make sure the curses mode is enabled.  */
   tui_enable ();
 
@@ -142,15 +140,7 @@  tui_show_registers (struct reggroup *group)
     {
       tui_show_register_group (TUI_DATA_WIN, group, get_selected_frame (NULL),
 			       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.  */
       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->display_all_data ();
     }
+  else
+    {
+      TUI_DATA_WIN->current_group = 0;
+      TUI_DATA_WIN->erase_data_content (NO_REGS_STRING);
+    }
 }