From patchwork Fri Sep 8 18:23:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 75565 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 B5E16385C6E7 for ; Fri, 8 Sep 2023 19:03:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B5E16385C6E7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694199809; bh=YprK4/GIgN7WzXGfnRVmdvo/Zs2kWdih2O+VVBbuFy8=; 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=FYIovN9ERDPdXvwNUaAHV/QJaGsubfzfkHyrpfRgpLKRGI13wejfGWSBM1iftLTyp eCNyYWPSbWFYUs9scWY7aHTkzhkmRt4bGZT6azqo5P68eXLxYOwjMpbAhmc647sPqJ KzgjLD48EgVgBH45hdotv8vFhpTKitMtkULuJoBA= 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 0754F3858404 for ; Fri, 8 Sep 2023 19:02:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0754F3858404 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 0FDE31E11B; Fri, 8 Sep 2023 15:02:30 -0400 (EDT) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 06/21] gdb: uncover some current_ui uses in interp_set Date: Fri, 8 Sep 2023 14:23:00 -0400 Message-ID: <20230908190227.96319-7-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" A following patch will make interp_set a method of struct ui. Before doing this, I'd like to uncover all the hidden uses of current_ui, as they will be replaced with a passed-in `ui` parameter, and then `this`. So, replace uses of the current_uiout macro with the long form. Change-Id: I8de2e6a451de11ff9040322bd0869021171dcf7f --- gdb/interps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index bd95c3175adb..9d27d6a2bd2c 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -102,7 +102,7 @@ interp_set (struct interp *interp, bool top_level) if (old_interp != NULL) { - current_uiout->flush (); + current_ui->m_current_uiout->flush (); old_interp->suspend (); } @@ -126,7 +126,7 @@ interp_set (struct interp *interp, bool top_level) } /* Do this only after the interpreter is initialized. */ - current_uiout = interp->interp_ui_out (); + current_ui->m_current_uiout = interp->interp_ui_out (); /* Clear out any installed interpreter hooks/event handlers. */ clear_interpreter_hooks ();