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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 15bdcc7cc1866290cd335795d0e63d395a6ae3f1..93bb11300f8eb0223e19bcc00cc930f24dd08a09 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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>
 
        * tui/tui-regs.c (tui_show_registers): Update.

diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 17b3b2867124b313441a536fc1d92c9511cbc729..59bfd08a0972db534f23ae1a0e539d0e96272774 100644 (file)
--- 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);
+    }
 }