From patchwork Fri Sep 8 18:23:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 75571 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 370063830B64 for ; Fri, 8 Sep 2023 19:05:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 370063830B64 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694199901; bh=pjhVujp/ZrIi261cDad8N7qre98rNzlKa1uIzFHJmkc=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=iAJH51bYYkWzLJerOAqcaD/S8zVsJk9rLQPFDg6VrQLWkeoD6/wDC57tSfzp7hy+D ZLVOHq1hwDi4p1sJ4vwzVnv9qvrgFUt13TmuZPUP+EH2h+t1/+HVgB+gPuA7PQGb/9 zE107SGYQKs8qUOgnmEBaNdXWqRxqncL3I6t6fCY= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id BB5673858416 for ; Fri, 8 Sep 2023 19:04:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB5673858416 Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 25EFF1E0D2; Fri, 8 Sep 2023 15:04:31 -0400 (EDT) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 12/21] gdb/tui: use m_ui instead of current_ui in tui_interp::resume Date: Fri, 8 Sep 2023 14:23:06 -0400 Message-ID: <20230908190227.96319-13-simon.marchi@efficios.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230908190227.96319-1-simon.marchi@efficios.com> References: <20230908190227.96319-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3497.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" No behavior changes expected. Change-Id: I607a50a7ed83d9afd536d41d6318fc4cd24d8192 --- gdb/tui/tui-interp.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c index af99501ac69f..87c079949f4b 100644 --- a/gdb/tui/tui-interp.c +++ b/gdb/tui/tui-interp.c @@ -107,23 +107,20 @@ tui_command_line_handler (gdb::unique_xmalloc_ptr &&rl) void tui_interp::resume () { - struct ui *ui = current_ui; - struct ui_file *stream; - /* gdb_setup_readline will change gdb_stdout. If the TUI was previously writing to gdb_stdout, then set it to the new gdb_stdout afterwards. */ - stream = tui_old_uiout->set_stream (gdb_stdout); + ui_file *stream = tui_old_uiout->set_stream (gdb_stdout); if (stream != gdb_stdout) { tui_old_uiout->set_stream (stream); stream = NULL; } - gdb_setup_readline (ui, 1); + gdb_setup_readline (m_ui, 1); - ui->input_handler = tui_command_line_handler; + m_ui->input_handler = tui_command_line_handler; if (stream != NULL) tui_old_uiout->set_stream (gdb_stdout);