From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@adacore.com>
Subject: [PATCH 1/2] Rename fields of cli_interp_base::saved_output_files
Date: Mon, 28 Nov 2022 14:28:44 -0700 [thread overview]
Message-ID: <20221128212845.2397077-2-tromey@adacore.com> (raw)
In-Reply-To: <20221128212845.2397077-1-tromey@adacore.com>
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.
---
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 @@ class cli_interp_base : public interp
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
--
2.34.3
next prev parent reply other threads:[~2022-11-28 21:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 21:28 [PATCH 0/2] Minor redirection changes Tom Tromey
2022-11-28 21:28 ` Tom Tromey [this message]
2022-11-28 21:28 ` [PATCH 2/2] Use ui_file_up in mi_interp Tom Tromey
2022-11-29 2:55 ` [PATCH 0/2] Minor redirection changes Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221128212845.2397077-2-tromey@adacore.com \
--to=tromey@adacore.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).