From 81e6b8eb208c427028d919afb2b5cabbc355fc88 Mon Sep 17 00:00:00 2001 From: Christian Biesinger Date: Mon, 7 Oct 2019 17:38:51 -0500 Subject: Make tui-winsource not use breakpoint_chain That's an internal variable of breakpoint.c. Insted, use iterate_over_breakpoints to update the breakpoint list. gdb/ChangeLog: 2019-10-15 Christian Biesinger * breakpoint.c (breakpoint_chain): Make static. * tui/tui-winsource.c: Call iterate_over_breakpoints instead of accessing breakpoint_chain. Change-Id: Ic259b2c3a4c1f5a47f34cfd7fccbdcf274417429 --- gdb/tui/tui-winsource.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gdb/tui') diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index f1c9f95..3fbc49f 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -401,8 +401,6 @@ tui_source_window_base::update_breakpoint_info for (i = 0; i < content.size (); i++) { - struct breakpoint *bp; - extern struct breakpoint *breakpoint_chain; struct tui_source_element *line; line = &content[i]; @@ -413,9 +411,7 @@ tui_source_window_base::update_breakpoint_info do with it. Identify enable/disabled breakpoints as well as those that we already hit. */ tui_bp_flags mode = 0; - for (bp = breakpoint_chain; - bp != NULL; - bp = bp->next) + iterate_over_breakpoints ([&] (breakpoint *bp) -> bool { struct bp_location *loc; @@ -423,7 +419,7 @@ tui_source_window_base::update_breakpoint_info || line->line_or_addr.loa == LOA_ADDRESS); if (bp == being_deleted) - continue; + return false; for (loc = bp->loc; loc != NULL; loc = loc->next) { @@ -441,7 +437,8 @@ tui_source_window_base::update_breakpoint_info mode |= TUI_BP_HARDWARE; } } - } + return false; + }); if (line->break_mode != mode) { line->break_mode = mode; -- cgit v1.1