From: Joel Brobecker <brobecker@adacore.com>
To: gdb-patches@sourceware.org
Cc: Pedro Alves <palves@redhat.com>
Subject: [pushed] Get rid of deprecated_init_ui_hook
Date: Wed, 06 May 2015 17:52:00 -0000 [thread overview]
Message-ID: <1430934722-27503-1-git-send-email-brobecker@adacore.com> (raw)
In-Reply-To: <554A00BD.8040308@redhat.com>
As demonstrated by Pedro in:
https://www.sourceware.org/ml/gdb-patches/2015-05/msg00095.html
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.
Tested on x86_64-linux and pushed.
Thanks!
--
Joel
---
gdb/ChangeLog | 10 ++++++++++
gdb/defs.h | 5 -----
gdb/interps.c | 1 -
gdb/main.c | 3 +--
gdb/top.c | 14 --------------
5 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd4bcad..8184af9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
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.
* windows-nat.c (set_windows_aliases): Delete.
(_initialize_windows_nat): Remove deprecated_init_ui_hook
diff --git a/gdb/defs.h b/gdb/defs.h
index eda6741..29bb8c4 100644
--- 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 90b5b2d..4c1e6cc 100644
--- 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 477fd68..aecd60a 100644
--- 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 ddf5415..deb4108 100644
--- 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
--
1.9.1
prev parent reply other threads:[~2015-05-06 17:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-05 18:02 [RFA/doco/commit] Make the "info dll" command available on all platform Joel Brobecker
2015-05-05 18:35 ` Eli Zaretskii
2015-05-06 17:50 ` Joel Brobecker
2015-05-06 11:53 ` Pedro Alves
2015-05-06 17:52 ` Joel Brobecker [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430934722-27503-1-git-send-email-brobecker@adacore.com \
--to=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=palves@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox