diff options
author | Alan Hayward <alan.hayward@arm.com> | 2019-05-17 14:07:04 +0100 |
---|---|---|
committer | Alan Hayward <alan.hayward@arm.com> | 2019-05-17 14:07:04 +0100 |
commit | f3a09c800fcd1d597fa2b9578cb59adfc15b698d (patch) | |
tree | 0cfd6d8b1c65fb029a59d706d47aee2f92c990c7 /gdb/ui-file.c | |
parent | af4fa23fba220c1b26bb3c8a7996b406dcc181cc (diff) | |
download | gdb-f3a09c800fcd1d597fa2b9578cb59adfc15b698d.zip gdb-f3a09c800fcd1d597fa2b9578cb59adfc15b698d.tar.gz gdb-f3a09c800fcd1d597fa2b9578cb59adfc15b698d.tar.bz2 |
Change file close behavior for tee_file
Instead of using two bools to decide if the files should close when tee_file
is closed, make file one stay open and file two close. This simplifies the
use cases for it.
Inline the make_logging_output into the calling functions (the logic here
looks ugly in order to simplify a later change).
Expand ui-redirect.exp to cover the changes, similar to mi-logging.exp.
gdb/ChangeLog:
* cli/cli-interp.c (cli_interp_base::set_logging): Create tee_file
directly.
* cli/cli-interp.h (make_logging_output): Remove declaration.
* cli/cli-logging.c (make_logging_output): Remove function.
* mi/mi-interp.c (mi_interp::set_logging): Create tee_file
directly.
* ui-file.c (tee_file::tee_file): Remove bools.
(tee_file::~tee_file): Remove deletes.
* ui-file.h (tee_file): Remove bools.
gdb/testsuite/ChangeLog:
* gdb.base/ui-redirect.exp: Test redirection.
Diffstat (limited to 'gdb/ui-file.c')
-rw-r--r-- | gdb/ui-file.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gdb/ui-file.c b/gdb/ui-file.c index 4139b5d..24c914f 100644 --- a/gdb/ui-file.c +++ b/gdb/ui-file.c @@ -336,20 +336,13 @@ stderr_file::stderr_file (FILE *stream) -tee_file::tee_file (ui_file *one, bool close_one, - ui_file *two, bool close_two) +tee_file::tee_file (ui_file *one, ui_file_up &&two) : m_one (one), - m_two (two), - m_close_one (close_one), - m_close_two (close_two) + m_two (std::move (two)) {} tee_file::~tee_file () { - if (m_close_one) - delete m_one; - if (m_close_two) - delete m_two; } void |