Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-27 01:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename fields of cli_interp_base::saved_output_files

Browse Source 
This renames the fields of cli_interp_base::saved_output_files, as
requested by Simon.  I tried to choose names that more obviously
reflect what the field is used for.  I also added a couple of
comments.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
This commit is contained in:
Tom Tromey
2022-11-28 14:01:35 -07:00
parent aaa79cd62b
commit 35254615ab
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdb/cli/cli-interp.c
View File

@@ -387,7 +387,7 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect,
m_saved_output->targerr = gdb_stdtargerr;
ui_file *logfile_p = logfile.get ();
m_saved_output->file_to_delete = std::move (logfile);
m_saved_output->logfile_holder = std::move (logfile);
/* The new stdout and stderr only depend on whether logging
redirection is being done. */
@@ -395,19 +395,19 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect,
ui_file *new_stderr = logfile_p;
if (!logging_redirect)
{
m_saved_output->tee_to_delete.reset
m_saved_output->stdout_holder.reset
(new tee_file (gdb_stdout, logfile_p));
new_stdout = m_saved_output->tee_to_delete.get ();
m_saved_output->stderr_to_delete.reset
new_stdout = m_saved_output->stdout_holder.get ();
m_saved_output->stderr_holder.reset
(new tee_file (gdb_stderr, logfile_p));
new_stderr = m_saved_output->stderr_to_delete.get ();
new_stderr = m_saved_output->stderr_holder.get ();
}
m_saved_output->log_to_delete.reset
m_saved_output->stdlog_holder.reset
(new timestamped_file (debug_redirect ? logfile_p : new_stderr));
gdb_stdout = new_stdout;
gdb_stdlog = m_saved_output->log_to_delete.get ();
gdb_stdlog = m_saved_output->stdlog_holder.get ();
gdb_stderr = new_stderr;
gdb_stdtarg = new_stderr;
gdb_stdtargerr = new_stderr;

11
gdb/cli/cli-interp.h
View File

@@ -36,15 +36,18 @@ public:
private:
struct saved_output_files
{
/* Saved gdb_stdout, gdb_stderr, etc. */
ui_file *out;
ui_file *err;
ui_file *log;
ui_file *targ;
ui_file *targerr;
ui_file_up tee_to_delete;
ui_file_up stderr_to_delete;
ui_file_up file_to_delete;
ui_file_up log_to_delete;
/* When redirecting, some or all of these may be non-null
depending on the logging mode. */
ui_file_up stdout_holder;
ui_file_up stderr_holder;
ui_file_up stdlog_holder;
ui_file_up logfile_holder;
};
/* These hold the pushed copies of the gdb output files. If NULL