From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 61653 invoked by alias); 17 Jul 2019 18:37:17 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 61595 invoked by uid 306); 17 Jul 2019 18:37:17 -0000 Date: Wed, 17 Jul 2019 18:37:00 -0000 Message-ID: <20190717183717.61594.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Remove tui_display_data_from X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 80cb6c27099e199cca01bc1a2efb8e8fbc941a48 X-Git-Newrev: df5f8cab00a8076a5582efec028002d323950c8f X-SW-Source: 2019-07/txt/msg00093.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=df5f8cab00a8076a5582efec028002d323950c8f commit df5f8cab00a8076a5582efec028002d323950c8f Author: Tom Tromey Date: Wed Jun 26 16:00:05 2019 -0600 Remove tui_display_data_from 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. gdb/ChangeLog 2019-07-17 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. Diff: --- 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/ChangeLog b/gdb/ChangeLog index d7df8fd..3daafb3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2019-07-17 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. + +2019-07-17 Tom Tromey + * tui/tui-windata.h (tui_display_data_from_line): Don't declare. * tui/tui-windata.c (tui_display_data_from_line): Remove. (tui_display_data_from, tui_data_window::do_scroll_vertical): Call diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c index 4f18d73..722d0a5 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 fd8e625..9970cfa 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 */