Remove tui_set_focus

tui_set_focus_command is a simple wrapper for tui_set_focus, so rename
the latter and remove the wrapper function.

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

	* tui/tui-win.c (tui_set_focus_command): Rename from
	tui_set_focus.  Call tui_enable.
	(tui_set_focus_command): Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3e7bd9ec1297076a38acf5e4979a5d1453560573..1467352d27e4cc0ab3809e2333484bcf8a180294 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-07-17  Tom Tromey  <tom@tromey.com>
+
+       * tui/tui-win.c (tui_set_focus_command): Rename from
+       tui_set_focus.  Call tui_enable.
+       (tui_set_focus_command): Remove.
+
 2019-07-17  Tom Tromey  <tom@tromey.com>
 
        * tui/tui-winsource.c (tui_show_exec_info_content): Don't call

diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 52f0c51f320eb5a83985727efbaa1c07673ad225..083f046cafa800da8c8df76710b81c11dc45b235 100644 (file)
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -63,7 +63,6 @@ static int new_height_ok (struct tui_win_info *, int);
 static void tui_set_tab_width_command (const char *, int);
 static void tui_refresh_all_command (const char *, int);
 static void tui_all_windows_info (const char *, int);
-static void tui_set_focus_command (const char *, int);
 static void tui_scroll_forward_command (const char *, int);
 static void tui_scroll_backward_command (const char *, int);
 static void tui_scroll_left_command (const char *, int);
@@ -829,8 +828,10 @@ tui_scroll_right_command (const char *arg, int from_tty)
 
 /* Set focus to the window named by 'arg'.  */
 static void
-tui_set_focus (const char *arg, int from_tty)
+tui_set_focus_command (const char *arg, int from_tty)
 {
+  tui_enable ();
+
   if (arg != NULL)
     {
       char *buf_ptr = xstrdup (arg);
@@ -866,15 +867,6 @@ The window name specified must be valid and visible.\n"));
     warning (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE);
 }
 
-static void
-tui_set_focus_command (const char *arg, int from_tty)
-{
-  /* Make sure the curses mode is enabled.  */
-  tui_enable ();
-  tui_set_focus (arg, from_tty);
-}
-
-
 static void
 tui_all_windows_info (const char *arg, int from_tty)
 {