[2/2] Use ui_file_up in mi_interp
Commit Message
This changes mi_interp to use ui_file_up rather than explicit
management.
---
gdb/mi/mi-interp.c | 10 ++++------
gdb/mi/mi-interp.h | 4 ++--
2 files changed, 6 insertions(+), 8 deletions(-)
@@ -1276,7 +1276,7 @@ mi_interp::set_logging (ui_file_up logfile, bool logging_redirect,
mi->saved_raw_stdout = mi->raw_stdout;
ui_file *logfile_p = logfile.get ();
- mi->saved_raw_file_to_delete = logfile.release ();
+ mi->logfile_holder = std::move (logfile);
/* If something is not being redirected, then a tee containing both the
logfile and stdout. */
@@ -1284,19 +1284,17 @@ mi_interp::set_logging (ui_file_up logfile, bool logging_redirect,
if (!logging_redirect || !debug_redirect)
{
tee = new tee_file (mi->raw_stdout, logfile_p);
- mi->saved_tee_to_delete = tee;
+ mi->stdout_holder.reset (tee);
}
mi->raw_stdout = logging_redirect ? logfile_p : tee;
}
else
{
- delete mi->saved_raw_file_to_delete;
- delete mi->saved_tee_to_delete;
+ mi->logfile_holder.reset ();
+ mi->stdout_holder.reset ();
mi->raw_stdout = mi->saved_raw_stdout;
mi->saved_raw_stdout = nullptr;
- mi->saved_raw_file_to_delete = nullptr;
- mi->saved_tee_to_delete = nullptr;
}
mi->out->set_raw (mi->raw_stdout);
@@ -56,8 +56,8 @@ class mi_interp final : public interp
file which we need to delete, so we can restore correctly when
done. */
struct ui_file *saved_raw_stdout;
- struct ui_file *saved_raw_file_to_delete;
- struct ui_file *saved_tee_to_delete;
+ ui_file_up logfile_holder;
+ ui_file_up stdout_holder;
/* MI's builder. */
struct ui_out *mi_uiout;