From 02c28df011542448e99041e32bec331c92b39945 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 23 Jun 2019 10:25:03 -0600 Subject: [PATCH] Use bool for is_exec_point This changes tui_source_element::is_exec_point to be a bool. I looked at also changing "has_break", but it turns out that this field is used inconsistently (sometimes as flags and sometimes as a bool), and so needs more invesstigation before it can be changed. gdb/ChangeLog 2019-06-25 Tom Tromey * tui/tui-winsource.c (tui_clear_source_content) (tui_source_window_base::set_is_exec_point_at): Update. * tui/tui-source.c (tui_set_source_content_nil): Update. * tui/tui-data.h (struct tui_source_element) : Now a bool. * tui/tui-data.c (init_content_element): Update. --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-data.c | 2 +- gdb/tui/tui-data.h | 2 +- gdb/tui/tui-source.c | 2 +- gdb/tui/tui-winsource.c | 12 ++++++------ 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8519e46625a..02d96d106b4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2019-06-25 Tom Tromey + + * tui/tui-winsource.c (tui_clear_source_content) + (tui_source_window_base::set_is_exec_point_at): Update. + * tui/tui-source.c (tui_set_source_content_nil): Update. + * tui/tui-data.h (struct tui_source_element) : Now + a bool. + * tui/tui-data.c (init_content_element): Update. + 2019-06-25 Tom Tromey * tui/tui-wingeneral.c (tui_gen_win_info::make_visible): Update. diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 881e5d592a6..5addd2d2ab0 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -368,7 +368,7 @@ init_content_element (struct tui_win_element *element, element->which_element.source.line = NULL; element->which_element.source.line_or_addr.loa = LOA_LINE; element->which_element.source.line_or_addr.u.line_no = 0; - element->which_element.source.is_exec_point = FALSE; + element->which_element.source.is_exec_point = false; element->which_element.source.has_break = FALSE; break; default: diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 8ec5ddfc0ab..d89027b031b 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -174,7 +174,7 @@ struct tui_source_element { char *line; struct tui_line_or_address line_or_addr; - int is_exec_point; + bool is_exec_point; int has_break; }; diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index e1448dbd961..54e4e1be903 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -244,7 +244,7 @@ tui_set_source_content_nil (struct tui_win_info *win_info, element->which_element.source.line_or_addr.loa = LOA_LINE; element->which_element.source.line_or_addr.u.line_no = 0; - element->which_element.source.is_exec_point = FALSE; + element->which_element.source.is_exec_point = false; element->which_element.source.has_break = FALSE; /* Set the contents of the line to blank. */ diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 204fee13be9..f30c3d67632 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -218,7 +218,7 @@ tui_clear_source_content (struct tui_win_info *win_info, struct tui_win_element *element = win_info->content[i]; element->which_element.source.has_break = FALSE; - element->which_element.source.is_exec_point = FALSE; + element->which_element.source.is_exec_point = false; } } } @@ -351,13 +351,13 @@ tui_source_window_base::do_scroll_horizontal (int num_to_scroll) void tui_source_window_base::set_is_exec_point_at (struct tui_line_or_address l) { - int changed = 0; + bool changed = false; int i; i = 0; while (i < content_size) { - int new_state; + bool new_state; struct tui_line_or_address content_loa = content[i]->which_element.source.line_or_addr; @@ -367,12 +367,12 @@ tui_source_window_base::set_is_exec_point_at (struct tui_line_or_address l) if (content_loa.loa == l.loa && ((l.loa == LOA_LINE && content_loa.u.line_no == l.u.line_no) || (content_loa.u.addr == l.u.addr))) - new_state = TRUE; + new_state = true; else - new_state = FALSE; + new_state = false; if (new_state != content[i]->which_element.source.is_exec_point) { - changed++; + changed = true; content[i]->which_element.source.is_exec_point = new_state; tui_show_source_line (this, i + 1); } -- 2.30.2