gdb: Use scoped_restore_terminal_state in annotate.c
Commit Message
In a couple of places in annotate.c we are manually backing up and
restoring the terminal ownership, we could instead make use of
scoped_restore_terminal_state.
gdb/ChangeLog:
* annotate.c (annotate_breakpoints_invalid): Make use of
scoped_restore_terminal_state.
(annotate_frames_invalid): Likewise.
---
gdb/ChangeLog | 6 ++++++
gdb/annotate.c | 18 ++----------------
2 files changed, 8 insertions(+), 16 deletions(-)
Comments
>>>>> "Andrew" == Andrew Burgess <andrew.burgess@embecosm.com> writes:
Andrew> In a couple of places in annotate.c we are manually backing up and
Andrew> restoring the terminal ownership, we could instead make use of
Andrew> scoped_restore_terminal_state.
Thanks, this seems like a good cleanup to me.
Tom
@@ -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;
}
}