From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 104855 invoked by alias); 4 Jul 2019 17:03:23 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 104653 invoked by uid 89); 4 Jul 2019 17:03:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=HX-Languages-Length:2273, H*RU:esmtpa, H*r:esmtpa, HX-Spam-Relays-External:esmtpa X-HELO: gateway36.websitewelcome.com Received: from gateway36.websitewelcome.com (HELO gateway36.websitewelcome.com) (192.185.192.36) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 Jul 2019 17:03:19 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway36.websitewelcome.com (Postfix) with ESMTP id 9D547400C8B94 for ; Thu, 4 Jul 2019 11:25:54 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id j58ghF0IE90onj58ghBMVK; Thu, 04 Jul 2019 12:03:18 -0500 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=cutbb19u97oJIgxXvUKt9MAdIHdxZYb+5gOOv9j7JCQ=; b=RQlAxdKLGP3v/1hTSgD0C9PPQ+ sMnZoucCLfM6WIPy0qEmCOwOYfB+7DnrkfvmIWksrzenxZPn/MG9AeuIsf4M9+0uuBUOSV3YMmhN2 sCx9DaYTVPbGx3Vyf2xxJFR5j; Received: from 174-29-58-150.hlrn.qwest.net ([174.29.58.150]:34692 helo=bapiya.Home) by box5379.bluehost.com with esmtpa (Exim 4.92) (envelope-from ) id 1hj58g-002sDI-3n; Thu, 04 Jul 2019 12:03:18 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 10/61] Remove tui_display_data_from Date: Thu, 04 Jul 2019 17:04:00 -0000 Message-Id: <20190704170311.15982-11-tom@tromey.com> In-Reply-To: <20190704170311.15982-1-tom@tromey.com> References: <20190704170311.15982-1-tom@tromey.com> X-SW-Source: 2019-07/txt/msg00151.txt.bz2 tui_display_data_from is only called from a single place. Inlining it there lets us remove some uses of the TUI_DATA_WIN global. 2019-07-04 Tom Tromey * tui/tui-windata.h (tui_display_data_from): Don't declare. * tui/tui-windata.c (tui_display_data_from): Remove. (tui_data_window::refresh_all): Update. --- gdb/ChangeLog | 6 ++++++ gdb/tui/tui-windata.c | 35 ++++++++++++----------------------- gdb/tui/tui-windata.h | 1 - 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c index 4f18d73aec2..722d0a5e26e 100644 --- a/gdb/tui/tui-windata.c +++ b/gdb/tui/tui-windata.c @@ -111,28 +111,6 @@ tui_display_all_data (void) } -/* Display data starting at element element_no. */ -void -tui_display_data_from (int element_no, int reuse_windows) -{ - int first_line = (-1); - - if (element_no < TUI_DATA_WIN->regs_content.size ()) - first_line = TUI_DATA_WIN->line_from_reg_element_no (element_no); - else - { /* Calculate the first_line from the element number. */ - } - - if (first_line >= 0) - { - tui_erase_data_content (NULL); - if (!reuse_windows) - tui_delete_data_content_windows (); - tui_display_registers_from_line (first_line); - } -} - - /* Function to redisplay the contents of the data window. */ void tui_data_window::refresh_all () @@ -143,7 +121,18 @@ tui_data_window::refresh_all () int first_element = first_data_item_displayed (); if (first_element >= 0) /* Re-use existing windows. */ - tui_display_data_from (first_element, TRUE); + { + int first_line = (-1); + + if (first_element < regs_content.size ()) + first_line = line_from_reg_element_no (first_element); + + if (first_line >= 0) + { + tui_erase_data_content (NULL); + tui_display_registers_from_line (first_line); + } + } } } diff --git a/gdb/tui/tui-windata.h b/gdb/tui/tui-windata.h index fd8e6257da7..9970cfae547 100644 --- a/gdb/tui/tui-windata.h +++ b/gdb/tui/tui-windata.h @@ -28,6 +28,5 @@ extern void tui_erase_data_content (const char *); extern void tui_display_all_data (void); extern void tui_delete_data_content_windows (void); extern void tui_refresh_data_win (void); -extern void tui_display_data_from (int, int); #endif /* TUI_TUI_WINDATA_H */ -- 2.17.2