From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.179.26]) by sourceware.org (Postfix) with ESMTPS id 7816438930D1 for ; Thu, 18 Jun 2020 02:15:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7816438930D1 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway36.websitewelcome.com (Postfix) with ESMTP id 385B441DA2026 for ; Wed, 17 Jun 2020 20:36:34 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id lk5QjPbkxQyTQlk5Qjdovt; Wed, 17 Jun 2020 21:15:28 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=t5PPnzhkcy9ebQl+SklTwUFvnL2boRaf/RHVFp14S3k=; b=Sm10eX92VnCqhP0gwGVm+Gu7lY L82LHJGNQRIAEL3gDCbXyu3TGFzyH/To61PWOVl+6fdhJYBxqyzMPB37LWXgulng7/haCLWEf0iju yo2tJeP+uVIZpI9/mFjac4BbW; Received: from 174-16-104-48.hlrn.qwest.net ([174.16.104.48]:54316 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jlk5P-003VvK-VM; Wed, 17 Jun 2020 20:15:28 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 06/11] Rename tui_data_item_window::item_no Date: Wed, 17 Jun 2020 20:15:18 -0600 Message-Id: <20200618021523.10681-7-tom@tromey.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200618021523.10681-1-tom@tromey.com> References: <20200618021523.10681-1-tom@tromey.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 174.16.104.48 X-Source-L: No X-Exim-ID: 1jlk5P-003VvK-VM X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-104-48.hlrn.qwest.net (bapiya.Home) [174.16.104.48]:54316 X-Source-Auth: tom+tromey.com X-Email-Count: 8 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3038.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Thu, 18 Jun 2020 02:15:29 -0000 tui_data_item_window::item_no is misnamed -- it only can be used for a register, but it references a "display" number as well. (Based on other comments I've seen in the past -- most since deleted -- I think there were plans at one point to display variables in this window as well. However, this was never implemented.) This patch renames this member to be more correct. 2020-06-14 Tom Tromey * tui/tui-regs.c (tui_data_window::show_register_group) (tui_data_window::check_register_values): Update. * tui/tui-regs.h (struct tui_data_item_window) : Rename from item_no. --- gdb/ChangeLog | 7 +++++++ gdb/tui/tui-regs.c | 4 ++-- gdb/tui/tui-regs.h | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 51fc475beda..fcabe73a5ea 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -259,7 +259,7 @@ tui_data_window::show_register_group (struct reggroup *group, data_item_win = &m_regs_content[pos]; if (!refresh_values_only) { - data_item_win->item_no = regnum; + data_item_win->regno = regnum; data_item_win->highlight = false; } tui_get_register (frame, data_item_win, regnum, 0); @@ -486,7 +486,7 @@ tui_data_window::check_register_values (struct frame_info *frame) was_hilighted = data_item_win.highlight; tui_get_register (frame, &data_item_win, - data_item_win.item_no, + data_item_win.regno, &data_item_win.highlight); if (data_item_win.highlight || was_hilighted) diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index 7acc0c7bd62..8b5e941a0a0 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -48,8 +48,8 @@ struct tui_data_item_window : public tui_gen_win_info return 1; } - /* The register number, or data display number. */ - int item_no = -1; + /* The register number. */ + int regno = -1; bool highlight = false; std::string content; }; -- 2.17.2