Inline command_loop in read_command_line

read_command_line is the only caller, and here we can assume we're
reading a regular file, not stdin.

gdb/ChangeLog:
2016-04-12  Pedro Alves  <palves@redhat.com>

	* top.c (read_command_file): Inline command_loop here.
	(command_loop): Delete.
This commit is contained in:
Pedro Alves 2016-04-12 16:49:29 +01:00
parent 3212b85845
commit faa4ebe148
2 changed files with 20 additions and 20 deletions

View File

@ -1,3 +1,8 @@
2016-04-12 Pedro Alves <palves@redhat.com>
* top.c (read_command_file): Inline command_loop here.
(command_loop): Delete.
2016-04-12 Pedro Alves <palves@redhat.com>
* top.c: Include "gdb_select.h".

View File

@ -283,7 +283,21 @@ read_command_file (FILE *stream)
cleanups = make_cleanup (do_restore_instream_cleanup, instream);
instream = stream;
command_loop ();
/* Read commands from `instream' and execute them until end of file
or error reading instream. */
while (instream != NULL && !feof (instream))
{
char *command;
/* Get a command-line. This calls the readline package. */
command = command_line_input (NULL, 0, NULL);
if (command == NULL)
break;
command_handler (command);
}
do_cleanups (cleanups);
}
@ -528,25 +542,6 @@ execute_command_to_string (char *p, int from_tty)
return retval;
}
/* Read commands from `instream' and execute them
until end of file or error reading instream. */
void
command_loop (void)
{
while (instream && !feof (instream))
{
char *command;
/* Get a command-line. This calls the readline package. */
command = command_line_input (instream == stdin ?
get_prompt () : (char *) NULL,
instream == stdin, "prompt");
if (command == NULL)
return;
command_handler (command);
}
}
/* When nonzero, cause dont_repeat to do nothing. This should only be
set via prevent_dont_repeat. */