From c5c136ea94f21e5ff968d5b402494611464c7b31 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 9 Mar 2016 18:24:59 +0000 Subject: [PATCH] gdb_readline -> gdb_readline_no_editing Name this such that it's clearer that this is not a wrapper for the real readline, but instead a replacement that provides no command line editing features. gdb/ChangeLog: 2016-03-09 Pedro Alves * defs.h (gdb_readline): Delete declaration. * top.c (gdb_readline): Rename to ... (gdb_readline_no_editing): ... this, and make static. --- gdb/ChangeLog | 6 ++++++ gdb/defs.h | 2 -- gdb/top.c | 7 ++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e715c9712f9..06d1373decd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-03-09 Pedro Alves + + * defs.h (gdb_readline): Delete declaration. + * top.c (gdb_readline): Rename to ... + (gdb_readline_no_editing): ... this, and make static. + 2016-03-09 Pedro Alves * utils.c (prompt_for_continue): Update comments. diff --git a/gdb/defs.h b/gdb/defs.h index f6ffeac0e6f..b94df305c8b 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -285,8 +285,6 @@ extern void print_transfer_performance (struct ui_file *stream, typedef void initialize_file_ftype (void); -extern char *gdb_readline (const char *); - extern char *gdb_readline_wrapper (const char *); extern char *command_line_input (const char *, int, char *); diff --git a/gdb/top.c b/gdb/top.c index fb1657a006d..e781cdd221f 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -608,8 +608,9 @@ prevent_dont_repeat (void) malloc'd and should be freed by the caller. A NULL return means end of file. */ -char * -gdb_readline (const char *prompt_arg) + +static char * +gdb_readline_no_editing (const char *prompt_arg) { int c; char *result; @@ -1117,7 +1118,7 @@ command_line_input (const char *prompt_arg, int repeat, char *annotation_suffix) } else { - rl = gdb_readline (prompt); + rl = gdb_readline_no_editing (prompt); } if (annotation_level > 1 && instream == stdin) -- 2.30.2