diff options
author | Pedro Alves <palves@redhat.com> | 2016-03-18 19:15:55 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2016-03-18 19:15:55 +0000 |
commit | cc1d1567294b483db41221e175ee6f95196ecdbc (patch) | |
tree | 4b053ce8a5509d26976f1701639d65929d863bd0 | |
parent | 4ae91812d9c57ba22c2cb028dd23f54c81e73842 (diff) | |
download | binutils-gdb-cc1d1567294b483db41221e175ee6f95196ecdbc.tar.gz |
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:
yyyy-mm-dd Pedro Alves <palves@redhat.com>
* top.c (read_command_file): Inline command_loop here.
(command_loop): Delete.
-rw-r--r-- | gdb/top.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/gdb/top.c b/gdb/top.c index 90a3f481c27..41ff6b280d8 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -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. */ |