From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 57FF5385840F; Mon, 18 Jul 2022 14:56:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 57FF5385840F Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Remove cli_out_new X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: efd3baf0dcb38d7ecc2c8b4d1553254d3c022b7a X-Git-Newrev: 66fd2c678e4bbd5855f0f09870862143a518bc58 Message-Id: <20220718145624.57FF5385840F@sourceware.org> Date: Mon, 18 Jul 2022 14:56:24 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jul 2022 14:56:24 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D66fd2c678e4b= bd5855f0f09870862143a518bc58 commit 66fd2c678e4bbd5855f0f09870862143a518bc58 Author: Tom Tromey Date: Thu Jun 23 14:37:57 2022 -0600 Remove cli_out_new =20 cli_out_new is just a small wrapper around 'new'. This patch removes it, replacing it with uses of 'new' instead. Diff: --- gdb/cli-out.c | 8 -------- gdb/cli-out.h | 4 +--- gdb/cli/cli-interp.c | 2 +- gdb/mi/mi-interp.c | 2 +- gdb/tui/tui-io.c | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/gdb/cli-out.c b/gdb/cli-out.c index e0802df352b..fdbed6f5e91 100644 --- a/gdb/cli-out.c +++ b/gdb/cli-out.c @@ -386,14 +386,6 @@ cli_ui_out::~cli_ui_out () { } =20 -/* Initialize private members at startup. */ - -cli_ui_out * -cli_out_new (struct ui_file *stream) -{ - return new cli_ui_out (stream, ui_source_list); -} - ui_file * cli_ui_out::set_stream (struct ui_file *stream) { diff --git a/gdb/cli-out.h b/gdb/cli-out.h index 3fc794b61a4..3f01fe0db6d 100644 --- a/gdb/cli-out.h +++ b/gdb/cli-out.h @@ -27,7 +27,7 @@ class cli_ui_out : public ui_out { public: =20 - explicit cli_ui_out (ui_file *stream, ui_out_flags flags); + explicit cli_ui_out (ui_file *stream, ui_out_flags flags =3D ui_source_l= ist); virtual ~cli_ui_out (); =20 ui_file *set_stream (ui_file *stream); @@ -113,8 +113,6 @@ private: std::vector m_meters; }; =20 -extern cli_ui_out *cli_out_new (struct ui_file *stream); - extern void cli_display_match_list (char **matches, int len, int max); =20 #endif diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index 036bc723b24..c26b6a75227 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -59,7 +59,7 @@ cli_interp::cli_interp (const char *name) : cli_interp_base (name) { /* Create a default uiout builder for the CLI. */ - this->cli_uiout =3D cli_out_new (gdb_stdout); + this->cli_uiout =3D new cli_ui_out (gdb_stdout); } =20 cli_interp::~cli_interp () diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 937a3d9d6f5..ae15177890c 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -141,7 +141,7 @@ mi_interp::init (bool top_level) mi->event_channel =3D new mi_console_file (mi->raw_stdout, "=3D", 0); mi->mi_uiout =3D mi_out_new (name ()); gdb_assert (mi->mi_uiout !=3D nullptr); - mi->cli_uiout =3D cli_out_new (mi->out); + mi->cli_uiout =3D new cli_ui_out (mi->out); =20 if (top_level) { diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 22c234a0dc2..deea9b90afc 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -910,7 +910,7 @@ tui_initialize_io (void) tui_out =3D tui_out_new (tui_stdout); =20 /* Create the default UI. */ - tui_old_uiout =3D cli_out_new (gdb_stdout); + tui_old_uiout =3D new cli_ui_out (gdb_stdout); =20 #ifdef TUI_USE_PIPE_FOR_READLINE /* Temporary solution for readline writing to stdout: redirect