From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by sourceware.org (Postfix) with ESMTPS id 121AB38582A1 for ; Tue, 5 Jul 2022 17:15:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 121AB38582A1 Received: by mail-il1-x133.google.com with SMTP id p18so2582047ilm.4 for ; Tue, 05 Jul 2022 10:15:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=70QQ5n+FAhG9hRFenfaWWj51BH6hM/TxFiik/IZBNiE=; b=VeBiqRtcjp6fKE96F18ANnBxJ7FstD14duyXa4rDYHzSbR6VNeQjmXh1FEAa3uL9yh M50svKnMr+zwciGdmtj6Wq7+ED1qupmz+sqc4vTjZt96XJq93zo2/HeWNARolzxi5E8T GYXMbIOIIKRwGSJ6m90d6QKOrtAlRt+dDblWC7l5wryXpgprmKwK9qg0SUBpwgWQ+KDm nRurRmGLtDVLqcMEIze/2e/4jbVmgRftUcHJAABqwNK1rFnsB2G6e8be6Za6uxvUnNeO /vumkXsjwPUqSek4ojujQEstWWu+iJDteFthx4GyJZzxnbqMI2oUmT8IIbRQSgR3P0O6 D51w== X-Gm-Message-State: AJIora8KBthHcSvAozyJKfUzyB2DYEvVFUcmi2gC51euwSRSI1xgTyOv NeHj4IOykpwcYt9+8V/rhMGStDN7QaVmKg== X-Google-Smtp-Source: AGRyM1t+fV+TIw3qzwozgWWDQaiF4nnKZih6VtCuK4z6AqcnikjF0TidA9ng23H2IgHJRka7e8lD0w== X-Received: by 2002:a05:6e02:12ea:b0:2da:bb5b:bcc5 with SMTP id l10-20020a056e0212ea00b002dabb5bbcc5mr20067804iln.173.1657041334303; Tue, 05 Jul 2022 10:15:34 -0700 (PDT) Received: from murgatroyd.Home (71-211-187-180.hlrn.qwest.net. [71.211.187.180]) by smtp.gmail.com with ESMTPSA id k1-20020a926f01000000b002dbee570531sm4631034ilc.18.2022.07.05.10.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 10:15:34 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/4] Remove cli_out_new Date: Tue, 5 Jul 2022 11:15:31 -0600 Message-Id: <20220705171532.1072851-4-tromey@adacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220705171532.1072851-1-tromey@adacore.com> References: <20220705171532.1072851-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2022 17:15:37 -0000 cli_out_new is just a small wrapper around 'new'. This patch removes it, replacing it with uses of 'new' instead. --- 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 () { } -/* 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: - explicit cli_ui_out (ui_file *stream, ui_out_flags flags); + explicit cli_ui_out (ui_file *stream, ui_out_flags flags = ui_source_list); virtual ~cli_ui_out (); ui_file *set_stream (ui_file *stream); @@ -113,8 +113,6 @@ class cli_ui_out : public ui_out std::vector m_meters; }; -extern cli_ui_out *cli_out_new (struct ui_file *stream); - extern void cli_display_match_list (char **matches, int len, int max); #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 = cli_out_new (gdb_stdout); + this->cli_uiout = new cli_ui_out (gdb_stdout); } cli_interp::~cli_interp () diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 8d6e0334a90..a14903a0718 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 = new mi_console_file (mi->raw_stdout, "=", 0); mi->mi_uiout = mi_out_new (name ()); gdb_assert (mi->mi_uiout != nullptr); - mi->cli_uiout = cli_out_new (mi->out); + mi->cli_uiout = new cli_ui_out (mi->out); 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 = tui_out_new (tui_stdout); /* Create the default UI. */ - tui_old_uiout = cli_out_new (gdb_stdout); + tui_old_uiout = new cli_ui_out (gdb_stdout); #ifdef TUI_USE_PIPE_FOR_READLINE /* Temporary solution for readline writing to stdout: redirect -- 2.34.1