From faa4ebe148cfe83f06d881cfc80d95575d3bf746 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 12 Apr 2016 16:49:29 +0100 Subject: [PATCH] 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 * top.c (read_command_file): Inline command_loop here. (command_loop): Delete. --- gdb/ChangeLog | 5 +++++ gdb/top.c | 35 +++++++++++++++-------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d6e2fe1bf3d..8cc34745e85 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-04-12 Pedro Alves + + * top.c (read_command_file): Inline command_loop here. + (command_loop): Delete. + 2016-04-12 Pedro Alves * top.c: Include "gdb_select.h". 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. */ -- 2.30.2