diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8ecf370e599..0841703435f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2018-07-03 Tom Tromey + + * infrun.c (follow_exec): Use exit_inferior_silent. + * inferior.c (exit_inferior_num_silent): Remove. + * inferior.h (exit_inferior_num_silent): Don't declare. + 2018-07-03 Tom Tromey PR cli/23340: diff --git a/gdb/inferior.c b/gdb/inferior.c index ab506f6aec5..22beea58a0c 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -250,14 +250,6 @@ exit_inferior_silent (inferior *inf) exit_inferior_1 (inf, 1); } -void -exit_inferior_num_silent (int num) -{ - struct inferior *inf = find_inferior_id (num); - - exit_inferior_1 (inf, 1); -} - /* See inferior.h. */ void diff --git a/gdb/infrun.c b/gdb/infrun.c index 28a4391c358..2eb25c03cda 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1190,7 +1190,7 @@ follow_exec (ptid_t ptid, char *exec_file_target) /* Do exit processing for the original inferior before adding the new inferior so we don't have two active inferiors with the same ptid, which can confuse find_inferior_ptid. */ - exit_inferior_num_silent (current_inferior ()->num); + exit_inferior_silent (current_inferior ()); inf = add_inferior_with_spaces (); inf->pid = pid;