diff options
author | Tom Tromey <tromey@adacore.com> | 2022-08-16 11:40:15 -0600 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2024-05-17 10:01:13 -0600 |
commit | f2e4bd45d95747128aefc1362129081deeb99d08 (patch) | |
tree | ef30b87f521be5a44c806f0ddf882aceece322c5 /gdb | |
parent | 5c51acfcce1e1ed997e3c2504c2a93a9ad16015e (diff) | |
download | fsf-binutils-gdb-f2e4bd45d95747128aefc1362129081deeb99d08.zip fsf-binutils-gdb-f2e4bd45d95747128aefc1362129081deeb99d08.tar.gz fsf-binutils-gdb-f2e4bd45d95747128aefc1362129081deeb99d08.tar.bz2 |
Remove gdb_stdtargerr
This patch removes gdb_stdtargerr. There doesn't seem to be a need
for this -- it is always the same as stdtarg, and (I believe) has been
for many years.
Approved-By: Andrew Burgess <aburgess@redhat.com>
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/cli/cli-interp.c | 3 | ||||
-rw-r--r-- | gdb/cli/cli-interp.h | 1 | ||||
-rw-r--r-- | gdb/interps.c | 1 | ||||
-rw-r--r-- | gdb/main.c | 2 | ||||
-rw-r--r-- | gdb/mi/mi-interp.c | 2 | ||||
-rw-r--r-- | gdb/remote-fileio.c | 2 | ||||
-rw-r--r-- | gdb/remote-sim.c | 4 | ||||
-rw-r--r-- | gdb/top.c | 2 | ||||
-rw-r--r-- | gdb/tui/tui-io.c | 2 | ||||
-rw-r--r-- | gdb/ui-out.c | 3 | ||||
-rw-r--r-- | gdb/ui-out.h | 1 | ||||
-rw-r--r-- | gdb/utils.h | 1 |
12 files changed, 3 insertions, 21 deletions
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index 7cefc39..a488c30 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -273,7 +273,6 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect, m_saved_output->err = gdb_stderr; m_saved_output->log = gdb_stdlog; m_saved_output->targ = gdb_stdtarg; - m_saved_output->targerr = gdb_stdtargerr; ui_file *logfile_p = logfile.get (); m_saved_output->logfile_holder = std::move (logfile); @@ -299,7 +298,6 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect, gdb_stdlog = m_saved_output->stdlog_holder.get (); gdb_stderr = new_stderr; gdb_stdtarg = new_stderr; - gdb_stdtargerr = new_stderr; } else { @@ -307,7 +305,6 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect, gdb_stderr = m_saved_output->err; gdb_stdlog = m_saved_output->log; gdb_stdtarg = m_saved_output->targ; - gdb_stdtargerr = m_saved_output->targerr; m_saved_output.reset (nullptr); } diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h index 137eb46..03b592f 100644 --- a/gdb/cli/cli-interp.h +++ b/gdb/cli/cli-interp.h @@ -50,7 +50,6 @@ private: ui_file *err; ui_file *log; ui_file *targ; - ui_file *targerr; /* When redirecting, some or all of these may be non-null depending on the logging mode. */ ui_file_up stdout_holder; diff --git a/gdb/interps.c b/gdb/interps.c index 59c4ec5..bd65d1a 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -296,7 +296,6 @@ interpreter_exec_cmd (const char *args, int from_tty) scoped_restore save_stderr = make_scoped_restore (&gdb_stderr); scoped_restore save_stdlog = make_scoped_restore (&gdb_stdlog); scoped_restore save_stdtarg = make_scoped_restore (&gdb_stdtarg); - scoped_restore save_stdtargerr = make_scoped_restore (&gdb_stdtargerr); if (args == NULL) error_no_arg (_("interpreter-exec command")); @@ -79,7 +79,6 @@ std::string python_libdir; /* Target IO streams. */ struct ui_file *gdb_stdtargin; struct ui_file *gdb_stdtarg; -struct ui_file *gdb_stdtargerr; /* True if --batch or --batch-silent was seen. */ int batch_flag = 0; @@ -679,7 +678,6 @@ captured_main_1 (struct captured_main_args *context) current_ui = main_ui; gdb_stdtarg = gdb_stderr; - gdb_stdtargerr = gdb_stderr; gdb_stdtargin = gdb_stdin; /* Put a CLI based uiout in place early. If the early initialization diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 07e036f..168e6ed 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -132,8 +132,6 @@ mi_interp::resume () gdb_stdlog = mi->log; /* Route target output through the MI. */ gdb_stdtarg = mi->targ; - /* Route target error through the MI as well. */ - gdb_stdtargerr = mi->targ; deprecated_show_load_progress = mi_load_progress; } diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c index b158246..11cf2bb 100644 --- a/gdb/remote-fileio.c +++ b/gdb/remote-fileio.c @@ -641,7 +641,7 @@ remote_fileio_func_write (remote_target *remote, char *buf) return; case FIO_FD_CONSOLE_OUT: { - ui_file *file = target_fd == 1 ? gdb_stdtarg : gdb_stdtargerr; + ui_file *file = gdb_stdtarg; file->write ((char *) buffer, length); file->flush (); ret = length; diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 38d7f5b..f92de61 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -380,7 +380,7 @@ gdb_os_write_stderr (host_callback *p, const char *buf, int len) { b[0] = buf[i]; b[1] = 0; - gdb_stdtargerr->puts (b); + gdb_stdtarg->puts (b); } return len; } @@ -390,7 +390,7 @@ gdb_os_write_stderr (host_callback *p, const char *buf, int len) static void gdb_os_flush_stderr (host_callback *p) { - gdb_stdtargerr->flush (); + gdb_stdtarg->flush (); } /* GDB version of gdb_printf callback. */ @@ -620,8 +620,6 @@ execute_fn_to_ui_file (struct ui_file *file, std::function<void(void)> fn) = make_scoped_restore (&gdb_stdlog, file); scoped_restore save_stdtarg = make_scoped_restore (&gdb_stdtarg, file); - scoped_restore save_stdtargerr - = make_scoped_restore (&gdb_stdtargerr, file); fn (); } diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 2673397..285c781 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -839,7 +839,6 @@ tui_setup_io (int mode) gdb_stderr = tui_stderr; gdb_stdlog = tui_stdlog; gdb_stdtarg = gdb_stderr; - gdb_stdtargerr = gdb_stderr; current_uiout = tui_out; /* Save tty for SIGCONT. */ @@ -852,7 +851,6 @@ tui_setup_io (int mode) gdb_stderr = tui_old_stderr; gdb_stdlog = tui_old_stdlog; gdb_stdtarg = gdb_stderr; - gdb_stdtargerr = gdb_stderr; current_uiout = tui_old_uiout; /* Restore readline. */ diff --git a/gdb/ui-out.c b/gdb/ui-out.c index d5bc494..7e9f238 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -900,14 +900,12 @@ buffered_streams::buffered_streams (buffer_group *group, ui_out *uiout) m_buffered_stderr (group, gdb_stderr), m_buffered_stdlog (group, gdb_stdlog), m_buffered_stdtarg (group, gdb_stdtarg), - m_buffered_stdtargerr (group, gdb_stdtargerr), m_uiout (uiout) { gdb_stdout = &m_buffered_stdout; gdb_stderr = &m_buffered_stderr; gdb_stdlog = &m_buffered_stdlog; gdb_stdtarg = &m_buffered_stdtarg; - gdb_stdtargerr = &m_buffered_stdtargerr; ui_file *stream = current_uiout->current_stream (); if (stream != nullptr) @@ -940,7 +938,6 @@ buffered_streams::remove_buffers () gdb_stderr = m_buffered_stderr.stream (); gdb_stdlog = m_buffered_stdlog.stream (); gdb_stdtarg = m_buffered_stdtarg.stream (); - gdb_stdtargerr = m_buffered_stdtargerr.stream (); if (m_buffered_current_uiout.has_value ()) current_uiout->redirect (nullptr); diff --git a/gdb/ui-out.h b/gdb/ui-out.h index 74b570b..ef9ce4f 100644 --- a/gdb/ui-out.h +++ b/gdb/ui-out.h @@ -645,7 +645,6 @@ private: buffering_file m_buffered_stderr; buffering_file m_buffered_stdlog; buffering_file m_buffered_stdtarg; - buffering_file m_buffered_stdtargerr; /* Buffer for current_uiout's output stream. */ std::optional<buffering_file> m_buffered_current_uiout; diff --git a/gdb/utils.h b/gdb/utils.h index f0189c7..66eec96 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -194,7 +194,6 @@ extern void gdb_flush (struct ui_file *stream); /* Target output that should bypass the pager, if one is in use. */ extern struct ui_file *gdb_stdtarg; -extern struct ui_file *gdb_stdtargerr; extern struct ui_file *gdb_stdtargin; /* Set the screen dimensions to WIDTH and HEIGHT. */ |