FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove "repeat" argument from command_line_input

Browse source 
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.
This commit is contained in:
Tom Tromey 2018-08-15 18:37:00 -06:00
parent 1258253330
commit 89fbedf3ab
7 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gdb/ChangeLog
View file

@ -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> 2018-08-17 Tom Tromey <tom@tromey.com>
* cli/cli-script.c (read_next_line): Pass 0 as repeat argument to * cli/cli-script.c (read_next_line): Pass 0 as repeat argument to

2
gdb/ada-lang.c
View file

@ -4041,7 +4041,7 @@ get_selections (int *choices, int n_choices, int max_results,
if (prompt == NULL) if (prompt == NULL)
prompt = "> "; prompt = "> ";
args = command_line_input (prompt, 0, annotation_suffix); args = command_line_input (prompt, annotation_suffix);
if (args == NULL) if (args == NULL)
error_no_arg (_("one or more choice numbers")); error_no_arg (_("one or more choice numbers"));

2
gdb/cli/cli-script.c
View file

@ -903,7 +903,7 @@ read_next_line (void)
else else
prompt_ptr = NULL; 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. */ /* Return true if CMD's name is NAME. */

2
gdb/defs.h
View file

@ -309,7 +309,7 @@ typedef void initialize_file_ftype (void);
extern char *gdb_readline_wrapper (const char *); 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); extern void print_prompt (void);

2
gdb/linespec.c
View file

@ -1554,7 +1554,7 @@ decode_line_2 (struct linespec_state *self,
{ {
prompt = "> "; prompt = "> ";
} }
args = command_line_input (prompt, 0, "overload-choice"); args = command_line_input (prompt, "overload-choice");
if (args == 0 || *args == 0) if (args == 0 || *args == 0)
error_no_arg (_("one or more choice numbers")); error_no_arg (_("one or more choice numbers"));

2
gdb/python/py-gdb-readline.c
View file

@ -41,7 +41,7 @@ gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout,
TRY TRY
{ {
p = command_line_input (prompt, 0, "python"); p = command_line_input (prompt, "python");
} }
/* Handle errors by raising Python exceptions. */ /* Handle errors by raising Python exceptions. */
CATCH (except, RETURN_MASK_ALL) CATCH (except, RETURN_MASK_ALL)

11
gdb/top.c
View file

@ -418,7 +418,7 @@ read_command_file (FILE *stream)
char *command; char *command;
/* Get a command-line. This calls the readline package. */ /* 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) if (command == NULL)
break; break;
command_handler (command); command_handler (command);
@ -1161,16 +1161,11 @@ gdb_safe_append_history (void)
NULL is returned for end of file. 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 This routine either uses fancy command line editing or simple input
as the user has requested. */ as the user has requested. */
char * char *
command_line_input (const char *prompt_arg, int repeat, command_line_input (const char *prompt_arg, const char *annotation_suffix)
const char *annotation_suffix)
{ {
static struct buffer cmd_line_buffer; static struct buffer cmd_line_buffer;
static int cmd_line_buffer_initialized; 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, cmd = handle_line_of_input (&cmd_line_buffer, rl,
repeat, annotation_suffix); 0, annotation_suffix);
if (cmd == (char *) EOF) if (cmd == (char *) EOF)
{ {
cmd = NULL; cmd = NULL;