aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-06-17 12:51:29 -0600
committerTom Tromey <tom@tromey.com>2019-06-25 07:48:40 -0600
commit21c32dca764039afd3517954f6dd0a23d0c9e16c (patch)
tree491280d42019bfe35603ac16a88aafb2c23d8f4d /gdb/tui
parent73fbdc65a1f3da143e604d95443dc11ee86af710 (diff)
downloadgdb-21c32dca764039afd3517954f6dd0a23d0c9e16c.zip
gdb-21c32dca764039afd3517954f6dd0a23d0c9e16c.tar.gz
gdb-21c32dca764039afd3517954f6dd0a23d0c9e16c.tar.bz2
Change more TUI functions to take a tui_source_window_base
Several more TUI functions should only be called with a source or disassembly window. This patch changes these functions so that this can be caught at compile time. gdb/ChangeLog 2019-06-25 Tom Tromey <tom@tromey.com> * tui/tui-winsource.h (tui_set_exec_info_content) (tui_show_exec_info_content, tui_erase_exec_info_content) (tui_clear_exec_info_content, tui_update_exec_info): Change argument to tui_source_window_base. * tui/tui-winsource.c (tui_set_exec_info_content) (tui_show_exec_info_content, tui_erase_exec_info_content) (tui_clear_exec_info_content, tui_update_exec_info): Change argument to tui_source_window_base.
Diffstat (limited to 'gdb/tui')
-rw-r--r--gdb/tui/tui-winsource.c26
-rw-r--r--gdb/tui/tui-winsource.h10
2 files changed, 15 insertions, 21 deletions
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 2de5c53..e55ce40 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -483,12 +483,11 @@ tui_update_breakpoint_info (struct tui_win_info *win,
based upon the input window which is either the source or
disassembly window. */
void
-tui_set_exec_info_content (struct tui_win_info *win_info)
+tui_set_exec_info_content (struct tui_source_window_base *win_info)
{
- tui_source_window_base *base = (tui_source_window_base *) win_info;
- if (base->execution_info != NULL)
+ if (win_info->execution_info != NULL)
{
- struct tui_gen_win_info *exec_info_ptr = base->execution_info;
+ struct tui_gen_win_info *exec_info_ptr = win_info->execution_info;
if (exec_info_ptr->content == NULL)
exec_info_ptr->content =
@@ -532,10 +531,9 @@ tui_set_exec_info_content (struct tui_win_info *win_info)
void
-tui_show_exec_info_content (struct tui_win_info *win_info)
+tui_show_exec_info_content (struct tui_source_window_base *win_info)
{
- tui_source_window_base *base = (tui_source_window_base *) win_info;
- struct tui_gen_win_info *exec_info = base->execution_info;
+ struct tui_gen_win_info *exec_info = win_info->execution_info;
int cur_line;
werase (exec_info->handle);
@@ -552,28 +550,24 @@ tui_show_exec_info_content (struct tui_win_info *win_info)
void
-tui_erase_exec_info_content (struct tui_win_info *win_info)
+tui_erase_exec_info_content (struct tui_source_window_base *win_info)
{
- tui_source_window_base *base = (tui_source_window_base *) win_info;
- struct tui_gen_win_info *exec_info = base->execution_info;
+ struct tui_gen_win_info *exec_info = win_info->execution_info;
werase (exec_info->handle);
exec_info->refresh_window ();
}
void
-tui_clear_exec_info_content (struct tui_win_info *win_info)
+tui_clear_exec_info_content (struct tui_source_window_base *win_info)
{
- tui_source_window_base *base = (tui_source_window_base *) win_info;
- base->execution_info->content_in_use = FALSE;
+ win_info->execution_info->content_in_use = FALSE;
tui_erase_exec_info_content (win_info);
-
- return;
}
/* Function to update the execution info window. */
void
-tui_update_exec_info (struct tui_win_info *win_info)
+tui_update_exec_info (struct tui_source_window_base *win_info)
{
tui_set_exec_info_content (win_info);
tui_show_exec_info_content (win_info);
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index 3ed461a..09a9d5a 100644
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -53,11 +53,11 @@ extern void tui_update_source_windows_with_line (struct symtab *,
extern void tui_clear_source_content (struct tui_win_info *, int);
extern void tui_erase_source_content (struct tui_win_info *, int);
extern void tui_show_source_content (struct tui_win_info *);
-extern void tui_set_exec_info_content (struct tui_win_info *);
-extern void tui_show_exec_info_content (struct tui_win_info *);
-extern void tui_erase_exec_info_content (struct tui_win_info *);
-extern void tui_clear_exec_info_content (struct tui_win_info *);
-extern void tui_update_exec_info (struct tui_win_info *);
+extern void tui_set_exec_info_content (struct tui_source_window_base *);
+extern void tui_show_exec_info_content (struct tui_source_window_base *);
+extern void tui_erase_exec_info_content (struct tui_source_window_base *);
+extern void tui_clear_exec_info_content (struct tui_source_window_base *);
+extern void tui_update_exec_info (struct tui_source_window_base *);
extern void tui_alloc_source_buffer (struct tui_win_info *);
extern int tui_line_is_displayed (int,