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  <palves@redhat.com>

	* defs.h (gdb_readline): Delete declaration.
	* top.c (gdb_readline): Rename to ...
	(gdb_readline_no_editing): ... this, and make static.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e715c9712f9452d464df20e91eeb65d6c0f1bb3d..06d1373decda9aaa61f1f9aa62906a1e7e741b29 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-09  Pedro Alves  <palves@redhat.com>
+
+       * 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  <palves@redhat.com>
 
        * utils.c (prompt_for_continue): Update comments.

diff --git a/gdb/defs.h b/gdb/defs.h
index f6ffeac0e6f16b84051e5a5a9a36a6b79b6d10f8..b94df305c8bf871438355050824c04895b1696d4 100644 (file)
--- 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 fb1657a006d03762868bbd7426471c57d3f51c1b..e781cdd221f6274626d93b57bebb3658c95405d7 100644 (file)
--- 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)