diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/annotate.c | 18 |
2 files changed, 8 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ee3377c..f4f5b54 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-06-14 Andrew Burgess <andrew.burgess@embecosm.com> + + * annotate.c (annotate_breakpoints_invalid): Make use of + scoped_restore_terminal_state. + (annotate_frames_invalid): Likewise. + 2019-06-14 Tom Tromey <tromey@adacore.com> * ada-lang.c (ada_evaluate_subexp) <case BINOP_ASSIGN>: Always diff --git a/gdb/annotate.c b/gdb/annotate.c index e6e8084..84940ff 100644 --- a/gdb/annotate.c +++ b/gdb/annotate.c @@ -61,17 +61,10 @@ annotate_breakpoints_invalid (void) && (!breakpoints_invalid_emitted || current_ui->prompt_state != PROMPT_BLOCKED)) { - /* If the inferior owns the terminal (e.g., we're resuming), - make sure to leave with the inferior still owning it. */ - int was_inferior = target_terminal::is_inferior (); - + target_terminal::scoped_restore_terminal_state term_state; target_terminal::ours_for_output (); printf_unfiltered (("\n\032\032breakpoints-invalid\n")); - - if (was_inferior) - target_terminal::inferior (); - breakpoints_invalid_emitted = 1; } } @@ -208,17 +201,10 @@ annotate_frames_invalid (void) && (!frames_invalid_emitted || current_ui->prompt_state != PROMPT_BLOCKED)) { - /* If the inferior owns the terminal (e.g., we're resuming), - make sure to leave with the inferior still owning it. */ - int was_inferior = target_terminal::is_inferior (); - + target_terminal::scoped_restore_terminal_state term_state; target_terminal::ours_for_output (); printf_unfiltered (("\n\032\032frames-invalid\n")); - - if (was_inferior) - target_terminal::inferior (); - frames_invalid_emitted = 1; } } |