From 63c715c603b979fe95172c1873247a0ec0bff849 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 14 Oct 2008 20:49:02 +0000 Subject: [PATCH] Remove dead code. * breakpoint.c (show_breakpoint_hit_counts): Delete. (print_one_breakpoint_location): Adjust. (breakpoint_clear_ignore_counts): Delete. * breakpoint.h (breakpoint_clear_ignore_counts): Remove declaration. * target.c (generic_mourn_inferior): Don't clear ignore counts (never reached). --- gdb/ChangeLog | 12 ++++++++++++ gdb/breakpoint.c | 18 ++---------------- gdb/breakpoint.h | 2 -- gdb/target.c | 8 -------- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 81370d2a112..d1347138803 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2008-10-14 Pedro Alves + + Remove dead code. + + * breakpoint.c (show_breakpoint_hit_counts): Delete. + (print_one_breakpoint_location): Adjust. + (breakpoint_clear_ignore_counts): Delete. + * breakpoint.h (breakpoint_clear_ignore_counts): Remove + declaration. + * target.c (generic_mourn_inferior): Don't clear ignore + counts (never reached). + 2008-10-10 Doug Evans * dwarf2read.c (comp_unit_head): Use unsigned int consistently diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 6e863d7f4ae..b289ead5eea 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -315,10 +315,6 @@ static int overlay_events_enabled; B ? (TMP=B->global_next, 1): 0; \ B = TMP) -/* True if breakpoint hit counts should be displayed in breakpoint info. */ - -int show_breakpoint_hit_counts = 1; - /* Chains of all breakpoints defined. */ struct breakpoint *breakpoint_chain; @@ -3812,7 +3808,7 @@ print_one_breakpoint_location (struct breakpoint *b, ui_out_text (uiout, "\n"); } - if (!part_of_multiple && show_breakpoint_hit_counts && b->hit_count) + if (!part_of_multiple && b->hit_count) { /* FIXME should make an annotation for this */ if (ep_is_catchpoint (b)) @@ -3830,7 +3826,7 @@ print_one_breakpoint_location (struct breakpoint *b, /* Output the count also if it is zero, but only if this is mi. FIXME: Should have a better test for this. */ if (ui_out_is_mi_like_p (uiout)) - if (!part_of_multiple && show_breakpoint_hit_counts && b->hit_count == 0) + if (!part_of_multiple && b->hit_count == 0) ui_out_field_int (uiout, "times", b->hit_count); if (!part_of_multiple && b->ignore_count) @@ -7731,16 +7727,6 @@ set_ignore_count (int bptnum, int count, int from_tty) error (_("No breakpoint number %d."), bptnum); } -/* Clear the ignore counts of all breakpoints. */ -void -breakpoint_clear_ignore_counts (void) -{ - struct breakpoint *b; - - ALL_BREAKPOINTS (b) - b->ignore_count = 0; -} - /* Command to set ignore-count of breakpoint N to COUNT. */ static void diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index db6e9724c8e..de21b9ab3b4 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -713,8 +713,6 @@ extern void delete_breakpoint (struct breakpoint *); extern void breakpoint_auto_delete (bpstat); -extern void breakpoint_clear_ignore_counts (void); - extern void break_command (char *, int); extern void hbreak_command_wrapper (char *, int); diff --git a/gdb/target.c b/gdb/target.c index 7452d2ab61e..654d3c06c9f 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -2336,7 +2336,6 @@ find_target_beneath (struct target_ops *t) void generic_mourn_inferior (void) { - extern int show_breakpoint_hit_counts; ptid_t ptid; ptid = inferior_ptid; @@ -2354,13 +2353,6 @@ generic_mourn_inferior (void) reopen_exec_file (); reinit_frame_cache (); - /* It is confusing to the user for ignore counts to stick around - from previous runs of the inferior. So clear them. */ - /* However, it is more confusing for the ignore counts to disappear when - using hit counts. So don't clear them if we're counting hits. */ - if (!show_breakpoint_hit_counts) - breakpoint_clear_ignore_counts (); - if (deprecated_detach_hook) deprecated_detach_hook (); } -- 2.30.2