Remove in_user_command

While working on the next patch in this series, I found that the
global in_user_command is not used.  This patch removes it.  (I didn't
think to check Insight until submitting this series; and it's not very
convenient to do so, so if someone has it checked out and could look
at it, that would be nice.)

ChangeLog
2017-08-03  Tom Tromey  <tom@tromey.com>

	* top.h (in_user_command): Remove.
	* top.c (in_user_command): Remove.
	* cli/cli-script.c (do_restore_user_call_depth)
	(execute_user_command): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 59556b407d343e27fbc392410cfca1297ef366ed..f7ccc82fa1a1e98a09a8c8ca9574f99bca68db47 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-03  Tom Tromey  <tom@tromey.com>
+
+       * top.h (in_user_command): Remove.
+       * top.c (in_user_command): Remove.
+       * cli/cli-script.c (do_restore_user_call_depth)
+       (execute_user_command): Update.
+
 2017-08-03  Tom Tromey  <tom@tromey.com>
 
        * valops.c (search_struct_method): Use gdb::byte_vector.

diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index a6d54566973a064bad24e2a121df9b3ebdab8cd9..527540a201d4c05f164625483286650891ef38b1 100644 (file)
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -379,8 +379,6 @@ do_restore_user_call_depth (void * call_depth)
   int *depth = (int *) call_depth;
 
   (*depth)--;
-  if ((*depth) == 0)
-    in_user_command = 0;
 }
 
 
@@ -411,10 +409,6 @@ execute_user_command (struct cmd_list_element *c, char *args)
   make_cleanup (do_restore_instream_cleanup, ui->instream);
   ui->instream = NULL;
 
-  /* Also set the global in_user_command, so that NULL instream is
-     not confused with Insight.  */
-  in_user_command = 1;
-
   scoped_restore save_async = make_scoped_restore (&current_ui->async, 0);
 
   command_nest_depth++;

diff --git a/gdb/top.c b/gdb/top.c
index 2504eb6e5f8d9f6047bfa7282aabf529d4189526..43bf0d42d41c704910d8410eb723f761a84b17fb 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -129,10 +129,6 @@ show_confirm (struct ui_file *file, int from_tty,
                    value);
 }
 
-/* Flag to indicate whether a user defined command is currently running.  */
-
-int in_user_command;
-
 /* Current working directory.  */
 
 char *current_directory;

diff --git a/gdb/top.h b/gdb/top.h
index 452a381951445aad81a05eb79071c3edbd4988bc..5d7cb1f810873598f57e8f0b4d8d4a327d4cb0c4 100644 (file)
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -218,7 +218,6 @@ extern void ui_unregister_input_event_handler (struct ui *ui);
 
 /* From top.c.  */
 extern char *saved_command_line;
-extern int in_user_command;
 extern int confirm;
 extern char gdb_dirbuf[1024];
 extern int inhibit_gdbinit;