OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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  <tom@tromey.com>

	* 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.
This commit is contained in:
Tom Tromey 2019-06-26 16:00:05 -06:00
parent 80cb6c2709
commit df5f8cab00
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2019-07-17 Tom Tromey <tom@tromey.com>
* 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 <tom@tromey.com>
* tui/tui-windata.h (tui_display_data_from_line): Don't declare.

35
gdb/tui/tui-windata.c
View File

@ -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);
}
}
}
}

1
gdb/tui/tui-windata.h
View File

@ -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 */