public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Rename fields of cli_interp_base::saved_output_files
@ 2022-11-30 14:36 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2022-11-30 14:36 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=35254615ab38c37cf934b28982691f458d4c9948
commit 35254615ab38c37cf934b28982691f458d4c9948
Author: Tom Tromey <tromey@adacore.com>
Date: Mon Nov 28 14:01:35 2022 -0700
Rename fields of cli_interp_base::saved_output_files
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>
Diff:
---
gdb/cli/cli-interp.c | 14 +++++++-------
gdb/cli/cli-interp.h | 11 +++++++----
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 3254efc3581..dbe46402c2b 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -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;
diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h
index 978e7f291e4..ad2167e0e1f 100644
--- a/gdb/cli/cli-interp.h
+++ b/gdb/cli/cli-interp.h
@@ -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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-11-30 14:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-30 14:36 [binutils-gdb] Rename fields of cli_interp_base::saved_output_files Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).