From: Pedro Alves Date: Wed, 9 Mar 2016 18:24:59 +0000 (+0000) Subject: gdb_readline2 -> gdb_readline_no_editing_callback X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c70061cf94691182484924c79cbbdd2203ef92d5;p=binutils-gdb.git gdb_readline2 -> gdb_readline_no_editing_callback The "2" in "gdb_readline2" doesn't really convey much. Rename for clarity. gdb/ChangeLog: 2016-03-09 Pedro Alves * event-top.c (gdb_readline2): Rename to ... (gdb_readline_no_editing_callback): ... this. (change_line_handler, stdin_event_handler) (gdb_setup_readline): Adjust. * event-top.h (gdb_readline2): Rename to ... (gdb_readline_no_editing_callback): ... this, and move closer to other readline-related declarations. * mi/mi-interp.c (mi_interpreter_resume): Adjust. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d220a0223e1..09b382624d1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2016-03-09 Pedro Alves + + * event-top.c (gdb_readline2): Rename to ... + (gdb_readline_no_editing_callback): ... this. + (change_line_handler, stdin_event_handler) + (gdb_setup_readline): Adjust. + * event-top.h (gdb_readline2): Rename to ... + (gdb_readline_no_editing_callback): ... this, and move closer to + other readline-related declarations. + * mi/mi-interp.c (mi_interpreter_resume): Adjust. + 2016-03-09 Pedro Alves * top.c (window_hook): Delete. diff --git a/gdb/event-top.c b/gdb/event-top.c index 2309cce2e3e..e3fa589c918 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -189,9 +189,9 @@ cli_command_loop (void *data) /* Change the function to be invoked every time there is a character ready on stdin. This is used when the user sets the editing off, therefore bypassing readline, and letting gdb handle the input - itself, via gdb_readline2. Also it is used in the opposite case in - which the user sets editing on again, by restoring readline - handling of the input. */ + itself, via gdb_readline_no_editing_callback. Also it is used in + the opposite case in which the user sets editing on again, by + restoring readline handling of the input. */ static void change_line_handler (void) { @@ -209,9 +209,9 @@ change_line_handler (void) } else { - /* Turn off editing by using gdb_readline2. */ + /* Turn off editing by using gdb_readline_no_editing_callback. */ gdb_rl_callback_handler_remove (); - call_readline = gdb_readline2; + call_readline = gdb_readline_no_editing_callback; /* Set up the command handler as well, in case we are called as first thing from .gdbinit. */ @@ -410,8 +410,9 @@ top_level_prompt (void) /* When there is an event ready on the stdin file desriptor, instead of calling readline directly throught the callback function, or - instead of calling gdb_readline2, give gdb a chance to detect - errors and do something. */ + instead of calling gdb_readline_no_editing_callback, give gdb a + chance to detect errors and do something. */ + void stdin_event_handler (int error, gdb_client_data client_data) { @@ -699,13 +700,11 @@ command_line_handler (char *rl) } /* Does reading of input from terminal w/o the editing features - provided by the readline library. */ + provided by the readline library. Calls the line input handler + once we have a whole input line. */ -/* NOTE: 1999-04-30 Asynchronous version of gdb_readline; gdb_readline - will become obsolete when the event loop is made the default - execution for gdb. */ void -gdb_readline2 (gdb_client_data client_data) +gdb_readline_no_editing_callback (gdb_client_data client_data) { int c; char *result; @@ -728,11 +727,12 @@ gdb_readline2 (gdb_client_data client_data) result = (char *) xmalloc (result_size); /* We still need the while loop here, even though it would seem - obvious to invoke gdb_readline2 at every character entered. If - not using the readline library, the terminal is in cooked mode, - which sends the characters all at once. Poll will notice that the - input fd has changed state only after enter is pressed. At this - point we still need to fetch all the chars entered. */ + obvious to invoke gdb_readline_no_editing_callback at every + character entered. If not using the readline library, the + terminal is in cooked mode, which sends the characters all at + once. Poll will notice that the input fd has changed state only + after enter is pressed. At this point we still need to fetch all + the chars entered. */ while (1) { @@ -1055,7 +1055,7 @@ gdb_setup_readline (void) else { async_command_editing_p = 0; - call_readline = gdb_readline2; + call_readline = gdb_readline_no_editing_callback; } /* When readline has read an end-of-line character, it passes the diff --git a/gdb/event-top.h b/gdb/event-top.h index 4f207700f0a..f9bd7b944ec 100644 --- a/gdb/event-top.h +++ b/gdb/event-top.h @@ -44,7 +44,6 @@ extern void handle_stop_sig (int sig); #endif extern void handle_sigint (int sig); extern void handle_sigterm (int sig); -extern void gdb_readline2 (void *client_data); extern void async_request_quit (void *arg); extern void stdin_event_handler (int error, void *client_data); extern void async_disable_stdin (void); @@ -62,6 +61,7 @@ extern void (*input_handler) (char *); extern int input_fd; extern void (*after_char_processing_hook) (void); extern int call_stdin_event_handler_again_p; +extern void gdb_readline_no_editing_callback (void *client_data); /* Wrappers for rl_callback_handler_remove and rl_callback_handler_install that keep track of whether the callback diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 7f42367820b..d02012c66f0 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -181,7 +181,7 @@ mi_interpreter_resume (void *data) /* These overwrite some of the initialization done in _intialize_event_loop. */ - call_readline = gdb_readline2; + call_readline = gdb_readline_no_editing_callback; input_handler = mi_execute_command_input_handler; async_command_editing_p = 0; /* FIXME: This is a total hack for now. PB's use of the MI