Get rid of deprecated_init_ui_hook

This hook is no longer used, and can therefore be eliminated.

gdb/ChangeLog:

        * defs.h (deprecated_init_ui_hook): Delete.  Remove associated
        comment.
        * top.c (deprecated_init_ui_hook): Delete.
        (gdb_init): Remove handling of deprecated_init_ui_hook.
        * interps.c (clear_interpreter_hooks): Remove handling of
        deprecated_init_ui_hook.
        * main.c (captured_main): Update comment.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd4bcadb56032e2ad813c9e8fcd3d65a0e0b4768..8184af94f63b38e9508322dfe1c0d7dd2e508497 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2015-05-06  Joel Brobecker  <brobecker@adacore.com>
+
+       * defs.h (deprecated_init_ui_hook): Delete.  Remove associated
+       comment.
+       * top.c (deprecated_init_ui_hook): Delete.
+       (gdb_init): Remove handling of deprecated_init_ui_hook.
+       * interps.c (clear_interpreter_hooks): Remove handling of
+       deprecated_init_ui_hook.
+       * main.c (captured_main): Update comment.
+
 2015-05-06  Joel Brobecker  <brobecker@adacore.com>
 
        * solib.c (_initialize_solib): Add "info dll" alias creation.

diff --git a/gdb/defs.h b/gdb/defs.h
index eda67417bf5bc7e396b7256a0baf55c8d87b6404..29bb8c4a3f4e81c9cd2347256cde76855031eb52 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -633,10 +633,6 @@ extern int watchdog;
 /* * The name of the interpreter if specified on the command line.  */
 extern char *interpreter_p;
 
-/* If a given interpreter matches INTERPRETER_P then it should update
-   deprecated_init_ui_hook with the per-interpreter implementation.  */
-/* FIXME: deprecated_init_ui_hook should be moved here.  */
-
 struct target_waitstatus;
 struct cmd_list_element;
 
@@ -644,7 +640,6 @@ extern void (*deprecated_pre_add_symbol_hook) (const char *);
 extern void (*deprecated_post_add_symbol_hook) (void);
 extern void (*selected_frame_level_changed_hook) (int);
 extern int (*deprecated_ui_loop_hook) (int signo);
-extern void (*deprecated_init_ui_hook) (char *argv0);
 extern void (*deprecated_show_load_progress) (const char *section,
                                              unsigned long section_sent, 
                                              unsigned long section_size, 

diff --git a/gdb/interps.c b/gdb/interps.c
index 90b5b2d51536112da68d860fe50ad3d8c17ce3f2..4c1e6cc206e622d39208def6969b2e08a38639a5 100644 (file)
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -362,7 +362,6 @@ interp_exec (struct interp *interp, const char *command_str)
 void
 clear_interpreter_hooks (void)
 {
-  deprecated_init_ui_hook = 0;
   deprecated_print_frame_info_listing_hook = 0;
   /*print_frame_more_info_hook = 0; */
   deprecated_query_hook = 0;

diff --git a/gdb/main.c b/gdb/main.c
index 477fd68c2ee1f80841849cc4dba56f4f2bf72a7d..aecd60afe6ca56b3f8ed3681eaf1ea06a464855a 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -859,8 +859,7 @@ captured_main (void *data)
   /* Try to set up an alternate signal stack for SIGSEGV handlers.  */
   setup_alternate_signal_stack ();
 
-  /* Initialize all files.  Give the interpreter a chance to take
-     control of the console via the deprecated_init_ui_hook ().  */
+  /* Initialize all files.  */
   gdb_init (gdb_program_name);
 
   /* Now that gdb_init has created the initial inferior, we're in

diff --git a/gdb/top.c b/gdb/top.c
index ddf5415e09d2f11bb0a53ce162db876fbaa313ae..deb4108987bc711ecfdd9e6f93c12288531e2ecf 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -172,14 +172,6 @@ char *lim_at_start;
 
 /* Hooks for alternate command interfaces.  */
 
-/* Called after most modules have been initialized, but before taking
-   users command file.
-
-   If the UI fails to initialize and it wants GDB to continue using
-   the default UI, then it should clear this hook before returning.  */
-
-void (*deprecated_init_ui_hook) (char *argv0);
-
 /* This hook is called from within gdb's many mini-event loops which
    could steal control from a real user interface's event loop.  It
    returns non-zero if the user is requesting a detach, zero
@@ -1970,12 +1962,6 @@ gdb_init (char *argv0)
   set_language (language_c);
   expected_language = current_language;        /* Don't warn about the change.  */
 
-  /* Allow another UI to initialize.  If the UI fails to initialize,
-     and it wants GDB to revert to the CLI, it should clear
-     deprecated_init_ui_hook.  */
-  if (deprecated_init_ui_hook)
-    deprecated_init_ui_hook (argv0);
-
   /* Python initialization, for example, can require various commands to be
      installed.  For example "info pretty-printer" needs the "info"
      prefix to be installed.  Keep things simple and just do final