This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 05/11] Remove unused deprecated_readline{_begin|_end}_hook
- From: Philipp Rudo <prudo at linux dot vnet dot ibm dot com>
- To: gdb-patches at sourceware dot org
- Cc: arnez at linux dot vnet dot ibm dot com
- Date: Tue, 28 Feb 2017 15:50:10 +0100
- Subject: [PATCH 05/11] Remove unused deprecated_readline{_begin|_end}_hook
- Authentication-results: sourceware.org; auth=none
- References: <20170228145016.22604-1-prudo@linux.vnet.ibm.com>
Nobody actually uses those hooks anymore. So simply remove them.
gdb/ChangeLog
* defs.h (deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook): Remove.
* top.c (deprecated_readline_begin_hook, deprecated_readline_hook)
(deprecated_readline_end_hook): Remove.
(command_line_input): Adjust.
* cli/cli-scrip.c (read_next_line, read_command_lines) Adjust.
* interps.c (clear_interpreter_hooks): Adjust.
---
gdb/cli/cli-script.c | 21 +++------------------
gdb/defs.h | 4 ----
gdb/interps.c | 3 ---
gdb/top.c | 24 +-----------------------
4 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index c3f1c65..9603261 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -889,8 +889,7 @@ read_next_line (void)
error (_("Control nesting too deep!"));
/* Set a prompt based on the nesting of the control commands. */
- if (from_tty
- || (ui->instream == 0 && deprecated_readline_hook != NULL))
+ if (from_tty)
{
for (i = 0; i < control_level; i++)
control_prompt[i] = ' ';
@@ -1216,17 +1215,8 @@ read_command_lines (char *prompt_arg, int from_tty, int parse_commands,
if (from_tty && input_interactive_p (current_ui))
{
- if (deprecated_readline_begin_hook)
- {
- /* Note - intentional to merge messages with no newline. */
- (*deprecated_readline_begin_hook) ("%s %s\n", prompt_arg,
- END_MESSAGE);
- }
- else
- {
- printf_unfiltered ("%s\n%s\n", prompt_arg, END_MESSAGE);
- gdb_flush (gdb_stdout);
- }
+ printf_unfiltered ("%s\n%s\n", prompt_arg, END_MESSAGE);
+ gdb_flush (gdb_stdout);
}
@@ -1245,11 +1235,6 @@ read_command_lines (char *prompt_arg, int from_tty, int parse_commands,
do_cleanups (old_chain);
}
- if (from_tty && input_interactive_p (current_ui)
- && deprecated_readline_end_hook)
- {
- (*deprecated_readline_end_hook) ();
- }
return (head);
}
diff --git a/gdb/defs.h b/gdb/defs.h
index f83fd8a..4f3bdd3 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -672,10 +672,6 @@ extern void (*deprecated_print_frame_info_listing_hook) (struct symtab * s,
int noerror);
extern int (*deprecated_query_hook) (const char *, va_list)
ATTRIBUTE_FPTR_PRINTF(1,0);
-extern void (*deprecated_readline_begin_hook) (char *, ...)
- ATTRIBUTE_FPTR_PRINTF_1;
-extern char *(*deprecated_readline_hook) (const char *);
-extern void (*deprecated_readline_end_hook) (void);
extern void (*deprecated_context_hook) (int);
extern ptid_t (*deprecated_target_wait_hook) (ptid_t ptid,
struct target_waitstatus *status,
diff --git a/gdb/interps.c b/gdb/interps.c
index 560ba70..bc56666 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -391,9 +391,6 @@ clear_interpreter_hooks (void)
deprecated_print_frame_info_listing_hook = 0;
/*print_frame_more_info_hook = 0; */
deprecated_query_hook = 0;
- deprecated_readline_begin_hook = 0;
- deprecated_readline_hook = 0;
- deprecated_readline_end_hook = 0;
deprecated_context_hook = 0;
deprecated_target_wait_hook = 0;
deprecated_call_command_hook = 0;
diff --git a/gdb/top.c b/gdb/top.c
index 3f8dfa9..fd5bd5a 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -194,22 +194,6 @@ void (*deprecated_print_frame_info_listing_hook) (struct symtab * s,
int (*deprecated_query_hook) (const char *, va_list);
-/* These three functions support getting lines of text from the user.
- They are used in sequence. First deprecated_readline_begin_hook is
- called with a text string that might be (for example) a message for
- the user to type in a sequence of commands to be executed at a
- breakpoint. If this function calls back to a GUI, it might take
- this opportunity to pop up a text interaction window with this
- message. Next, deprecated_readline_hook is called with a prompt
- that is emitted prior to collecting the user input. It can be
- called multiple times. Finally, deprecated_readline_end_hook is
- called to notify the GUI that we are done with the interaction
- window and it can close it. */
-
-void (*deprecated_readline_begin_hook) (char *, ...);
-char *(*deprecated_readline_hook) (const char *);
-void (*deprecated_readline_end_hook) (void);
-
/* Called as appropriate to notify the interface that we have attached
to or detached from an already running process. */
@@ -1263,16 +1247,10 @@ command_line_input (const char *prompt_arg, int repeat, char *annotation_suffix)
}
/* Don't use fancy stuff if not talking to stdin. */
- if (deprecated_readline_hook
+ if (command_editing_p
&& from_tty
&& input_interactive_p (current_ui))
{
- rl = (*deprecated_readline_hook) (prompt);
- }
- else if (command_editing_p
- && from_tty
- && input_interactive_p (current_ui))
- {
rl = gdb_readline_wrapper (prompt);
}
else
--
2.8.4