aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-08-15 18:37:00 -0600
committerTom Tromey <tom@tromey.com>2018-08-17 16:39:06 -0600
commit89fbedf3abc90b62fbb7f08782ed78d87b3fccaa (patch)
tree7cd80645b6c9d85b4d5e6610bcaec5375f5529a6
parent12582533306990c9406aedd960fa411c317a67de (diff)
downloadgdb-89fbedf3abc90b62fbb7f08782ed78d87b3fccaa.zip
gdb-89fbedf3abc90b62fbb7f08782ed78d87b3fccaa.tar.gz
gdb-89fbedf3abc90b62fbb7f08782ed78d87b3fccaa.tar.bz2
Remove "repeat" argument from command_line_input
After the previous patch, all callers pass 0 as the repeat argument to command_line_input. So, this patch removes it. gdb/ChangeLog 2018-08-16 Tom Tromey <tom@tromey.com> * top.c (read_command_file): Update. (command_line_input): Remove "repeat" argument. * ada-lang.c (get_selections): Update. * linespec.c (decode_line_2): Update. * defs.h (command_line_input): Remove argument. * cli/cli-script.c (read_next_line): Update. * python/py-gdb-readline.c: Update.
-rw-r--r--gdb/ChangeLog10
-rw-r--r--gdb/ada-lang.c2
-rw-r--r--gdb/cli/cli-script.c2
-rw-r--r--gdb/defs.h2
-rw-r--r--gdb/linespec.c2
-rw-r--r--gdb/python/py-gdb-readline.c2
-rw-r--r--gdb/top.c11
7 files changed, 18 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a40f39f..9ae0810 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2018-08-16 Tom Tromey <tom@tromey.com>
+
+ * top.c (read_command_file): Update.
+ (command_line_input): Remove "repeat" argument.
+ * ada-lang.c (get_selections): Update.
+ * linespec.c (decode_line_2): Update.
+ * defs.h (command_line_input): Remove argument.
+ * cli/cli-script.c (read_next_line): Update.
+ * python/py-gdb-readline.c: Update.
+
2018-08-17 Tom Tromey <tom@tromey.com>
* cli/cli-script.c (read_next_line): Pass 0 as repeat argument to
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 07a0536..db5334d 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -4041,7 +4041,7 @@ get_selections (int *choices, int n_choices, int max_results,
if (prompt == NULL)
prompt = "> ";
- args = command_line_input (prompt, 0, annotation_suffix);
+ args = command_line_input (prompt, annotation_suffix);
if (args == NULL)
error_no_arg (_("one or more choice numbers"));
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index d03b3bc..8496fb8 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -903,7 +903,7 @@ read_next_line (void)
else
prompt_ptr = NULL;
- return command_line_input (prompt_ptr, 0, "commands");
+ return command_line_input (prompt_ptr, "commands");
}
/* Return true if CMD's name is NAME. */
diff --git a/gdb/defs.h b/gdb/defs.h
index 4cf83f0..fc42170 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -309,7 +309,7 @@ typedef void initialize_file_ftype (void);
extern char *gdb_readline_wrapper (const char *);
-extern char *command_line_input (const char *, int, const char *);
+extern char *command_line_input (const char *, const char *);
extern void print_prompt (void);
diff --git a/gdb/linespec.c b/gdb/linespec.c
index 790ddf4..892d141 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -1554,7 +1554,7 @@ decode_line_2 (struct linespec_state *self,
{
prompt = "> ";
}
- args = command_line_input (prompt, 0, "overload-choice");
+ args = command_line_input (prompt, "overload-choice");
if (args == 0 || *args == 0)
error_no_arg (_("one or more choice numbers"));
diff --git a/gdb/python/py-gdb-readline.c b/gdb/python/py-gdb-readline.c
index a95be41..66f1ea8 100644
--- a/gdb/python/py-gdb-readline.c
+++ b/gdb/python/py-gdb-readline.c
@@ -41,7 +41,7 @@ gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout,
TRY
{
- p = command_line_input (prompt, 0, "python");
+ p = command_line_input (prompt, "python");
}
/* Handle errors by raising Python exceptions. */
CATCH (except, RETURN_MASK_ALL)
diff --git a/gdb/top.c b/gdb/top.c
index de1a335..470276e 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -418,7 +418,7 @@ read_command_file (FILE *stream)
char *command;
/* Get a command-line. This calls the readline package. */
- command = command_line_input (NULL, 0, NULL);
+ command = command_line_input (NULL, NULL);
if (command == NULL)
break;
command_handler (command);
@@ -1161,16 +1161,11 @@ gdb_safe_append_history (void)
NULL is returned for end of file.
- *If* input is from an interactive stream (stdin), the line read is
- copied into the global 'saved_command_line' so that it can be
- repeated.
-
This routine either uses fancy command line editing or simple input
as the user has requested. */
char *
-command_line_input (const char *prompt_arg, int repeat,
- const char *annotation_suffix)
+command_line_input (const char *prompt_arg, const char *annotation_suffix)
{
static struct buffer cmd_line_buffer;
static int cmd_line_buffer_initialized;
@@ -1255,7 +1250,7 @@ command_line_input (const char *prompt_arg, int repeat,
}
cmd = handle_line_of_input (&cmd_line_buffer, rl,
- repeat, annotation_suffix);
+ 0, annotation_suffix);
if (cmd == (char *) EOF)
{
cmd = NULL;