From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 1FAFC3858D20 for ; Fri, 17 May 2024 14:07:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1FAFC3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1FAFC3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715954826; cv=none; b=D0JHuAO81Tb1gWwBxeFNMuWoAYfT4NaFGIVj7J24V7dAAL6H5UYs0Z+oIKwKsngk1EgZ8oGqIEIPo+voU6MbxxV2rmwgF0qCRLlYta/jVVjUk3jY8LGsj+Pq9FM6xg55JS064kiSU1wKGca2JypNBj/eRlzZnhWwBKioFek8DmY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715954826; c=relaxed/simple; bh=SNKDWS5YkbqMkIo257yKqDYHa9tm3MA+JlhYIbzKvlU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=mXKQh/zD0Y133aDOyxB/Lb4JRTMH6tDlti7tZ/bI/EGk2YGt83cBnBMURFcIGTx6eM6BNK3S725Bs2J33YWsVKsSpY//ed4iqaWK8iH/iCU7ycQHvAassKfe+9Fc3Bp8Mh8sJoqEGNfPp3vPlbFb1B2sMmcv4VXdhxTq9KIr4uo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715954823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Y9SAXwa5LWiGfJSBhEHYq/8g3oCLZBKnYjWIOx9jc+k=; b=iF7F9boveTRWwBLr93Hrvai8pSGs6XYGnewCEBTSxSrKX46IdfFROxi6uy9YsIeSIRIhvO W2ARFSyKWpXsXP6jYifW3CL13lOCWLzM06sPZNS+q/8lGQaWL+d6Zsjc9M9GOCucHD7LKS ofgrlQQYfEFm1xkTdqkoKka3gF+eh54= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-145-7qD_upOUNBihuzErfjXlJA-1; Fri, 17 May 2024 10:07:00 -0400 X-MC-Unique: 7qD_upOUNBihuzErfjXlJA-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-574ebd190cbso3004064a12.0 for ; Fri, 17 May 2024 07:07:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715954819; x=1716559619; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Y9SAXwa5LWiGfJSBhEHYq/8g3oCLZBKnYjWIOx9jc+k=; b=RO3Qd2O81HK7pFSHNByPj5Rarth26tz/ZWLoXZhR+MW8W2MQymuzavr9sLLjkwb+qK z1JguSRYSZ5xT7WsNT5gSYbpD4kLWlCkfJL2cxFV3wM/MCk+SnrKsjGMOBDbaCUfhO6J 4O+oNAuFFMMOvsKRjtJuGdoiYzCwOfOPPlOtfa3/Vhwga116MZ7i683NFtDrmVzmYhP5 sotc28+FDl0ui6NePIN+5j53jwYVAwHTQzCqLq9F6cI104yylDM/ZYsCRtPBH91W/YJh mrdezbwiodAjRoaQxgSNSBOuoeCebc6LeUpEnhwAkiqrAcUZc6Oa9X6aRsAASdTBl/x0 S32Q== X-Forwarded-Encrypted: i=1; AJvYcCVfzBNhpo0kWeBJqPcsCBrbOdsJovSLziqqrDQXlgXjeYSMVFH9SLJxfvzh4N8SmeB2wTjfGRsEVmQ3udyFCUZO5ZYhA3mK/vFu3A== X-Gm-Message-State: AOJu0YwQfLy+jPvA0foIRERmSWSS7Ze32yJADb0GNvOBlyAuQrAk1Bj2 gCVACAx20CNP08SxVIj+Nq/HlbXC7Dbxn2LZrcb1ath4RQ6DUSZE/XVmxsu+kVdY/feVsO6P5SC q/zoGi2tMR5Lgo/eobGqAMIFteO4+DhVUaA7yiYeOCv4SsE1jVlbqz8UZmkL8pK5sQVk= X-Received: by 2002:a50:8a84:0:b0:572:d1e1:b4b3 with SMTP id 4fb4d7f45d1cf-5734d59d528mr16600652a12.7.1715954818501; Fri, 17 May 2024 07:06:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFhLWsHMsqiEwF6v8BikctR0h2DIsRvZi0ksAN3tMkFOY5G61DORqFgAJ10fuS/5qkLks9ElA== X-Received: by 2002:a50:8a84:0:b0:572:d1e1:b4b3 with SMTP id 4fb4d7f45d1cf-5734d59d528mr16600625a12.7.1715954817977; Fri, 17 May 2024 07:06:57 -0700 (PDT) Received: from localhost ([31.111.84.240]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574bcad0362sm8725785a12.20.2024.05.17.07.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 May 2024 07:06:57 -0700 (PDT) From: Andrew Burgess To: Tom Tromey , gdb-patches@sourceware.org Cc: Tom Tromey Subject: Re: [PATCH] Remove gdb_stdtargerr In-Reply-To: <20240514135700.3737770-1-tromey@adacore.com> References: <20240514135700.3737770-1-tromey@adacore.com> Date: Fri, 17 May 2024 15:06:57 +0100 Message-ID: <871q60r0qm.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tom Tromey writes: > 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. Looks reasonable to me. I tried to figure out what gdb_stdtarg and gdb_stdtargin are used for, and they both appear to be of pretty limited use. I wonder what value they are actually adding? Anyway, if there's ever a burning need for gdb_stdtargerr in the future, it'll be easy enough to bring back, so for now, I say clean it up. Approved-By: Andrew Burgess Thanks, Andrew > --- > gdb/cli/cli-interp.c | 3 --- > gdb/cli/cli-interp.h | 1 - > gdb/interps.c | 1 - > gdb/main.c | 2 -- > gdb/mi/mi-interp.c | 2 -- > gdb/remote-fileio.c | 2 +- > gdb/remote-sim.c | 4 ++-- > gdb/top.c | 2 -- > gdb/tui/tui-io.c | 2 -- > gdb/ui-out.c | 3 --- > gdb/ui-out.h | 1 - > 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 7cefc3902d8..a488c304fea 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 137eb466f6b..03b592fdf9c 100644 > --- a/gdb/cli/cli-interp.h > +++ b/gdb/cli/cli-interp.h > @@ -50,7 +50,6 @@ class cli_interp_base : public interp > 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 94a982e97ab..76561a350c1 100644 > --- a/gdb/interps.c > +++ b/gdb/interps.c > @@ -293,7 +293,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")); > diff --git a/gdb/main.c b/gdb/main.c > index 8b81640e8d2..a79a59102e1 100644 > --- a/gdb/main.c > +++ b/gdb/main.c > @@ -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 07e036f5ff9..168e6ed10b4 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 b15824637a9..11cf2bb16fa 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 38d7f5b7c0f..f92de619889 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. */ > diff --git a/gdb/top.c b/gdb/top.c > index b93ef0a69b5..b5e77ef6b05 100644 > --- a/gdb/top.c > +++ b/gdb/top.c > @@ -620,8 +620,6 @@ execute_fn_to_ui_file (struct ui_file *file, std::function 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 2673397cc46..285c781c25d 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 b3a2fb7f4e5..a692f0a45fe 100644 > --- a/gdb/ui-out.c > +++ b/gdb/ui-out.c > @@ -943,14 +943,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) > @@ -983,7 +981,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 5b6ddd55063..3d5e8e49ada 100644 > --- a/gdb/ui-out.h > +++ b/gdb/ui-out.h > @@ -642,7 +642,6 @@ struct buffered_streams > 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 m_buffered_current_uiout; > diff --git a/gdb/utils.h b/gdb/utils.h > index f0189c7d723..66eec9621fd 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. */ > -- > 2.44.0