aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2016-04-12 16:49:29 +0100
committerPedro Alves <palves@redhat.com>2016-04-12 16:50:41 +0100
commitfaa4ebe148cfe83f06d881cfc80d95575d3bf746 (patch)
tree170e75dad6d847eb8ab423f71efdfabf0c0826cc
parent3212b858458dc3f2ae73e32fa066dabd56919a13 (diff)
downloadgdb-faa4ebe148cfe83f06d881cfc80d95575d3bf746.zip
gdb-faa4ebe148cfe83f06d881cfc80d95575d3bf746.tar.gz
gdb-faa4ebe148cfe83f06d881cfc80d95575d3bf746.tar.bz2
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.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/top.c35
2 files changed, 20 insertions, 20 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d6e2fe1..8cc3474 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
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".
(gdb_readline_no_editing): Wait for input with gdb_select instead
of blocking in fgetc.
diff --git a/gdb/top.c b/gdb/top.c
index 90a3f48..41ff6b2 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. */