diff options
| author | Pedro Alves <palves@redhat.com> | 2016-08-10 23:03:28 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-08-10 23:03:28 +0100 |
| commit | 834c0d033bdade640aab149d0d4bd7b41dcb16af (patch) | |
| tree | 0f7032599f6776c858b2bf132aa1ce2632d3318d | |
| parent | 0375b0a53725b5b0bddcf8d31b707909f91afcb0 (diff) | |
| download | gdb-834c0d033bdade640aab149d0d4bd7b41dcb16af.zip gdb-834c0d033bdade640aab149d0d4bd7b41dcb16af.tar.gz gdb-834c0d033bdade640aab149d0d4bd7b41dcb16af.tar.bz2 | |
Simplify remove_breakpoint interface
All callers pass mark_uninserted, so there's no need for the 'is'
parameter.
gdb/ChangeLog:
2016-08-10 Pedro Alves <palves@redhat.com>
PR gdb/19187
* breakpoint.c (remove_breakpoint): Remove 'is' parameter and
always pass mark_uninserted to remove_breakpoint_1.
(insert_breakpoint_locations, remove_breakpoints)
(remove_breakpoints_pid, update_global_location_list): Update
callers.
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 14 |
2 files changed, 16 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 843da83..880ce72 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2016-08-10 Pedro Alves <palves@redhat.com> + + PR gdb/19187 + * breakpoint.c (remove_breakpoint): Remove 'is' parameter and + always pass mark_uninserted to remove_breakpoint_1. + (insert_breakpoint_locations, remove_breakpoints) + (remove_breakpoints_pid, update_global_location_list): Update + callers. + 2016-08-10 Руслан Ижбулатов <lrn1986@gmail.com> Pedro Alves <palves@redhat.com> diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index e4b62c7..a24eee1 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -201,7 +201,7 @@ typedef enum } insertion_state_t; -static int remove_breakpoint (struct bp_location *, insertion_state_t); +static int remove_breakpoint (struct bp_location *); static int remove_breakpoint_1 (struct bp_location *, insertion_state_t); static enum print_stop_action print_bp_stop_message (bpstat bs); @@ -3189,7 +3189,7 @@ insert_breakpoint_locations (void) { for (loc = bpt->loc; loc; loc = loc->next) if (loc->inserted) - remove_breakpoint (loc, mark_uninserted); + remove_breakpoint (loc); hw_breakpoint_error = 1; fprintf_unfiltered (tmp_error_stream, @@ -3229,7 +3229,7 @@ remove_breakpoints (void) ALL_BP_LOCATIONS (bl, blp_tmp) { if (bl->inserted && !is_tracepoint (bl->owner)) - val |= remove_breakpoint (bl, mark_uninserted); + val |= remove_breakpoint (bl); } return val; } @@ -3274,7 +3274,7 @@ remove_breakpoints_pid (int pid) if (bl->inserted && !bl->target_info.persist) { - val = remove_breakpoint (bl, mark_uninserted); + val = remove_breakpoint (bl); if (val != 0) return val; } @@ -4088,7 +4088,7 @@ remove_breakpoint_1 (struct bp_location *bl, insertion_state_t is) } static int -remove_breakpoint (struct bp_location *bl, insertion_state_t is) +remove_breakpoint (struct bp_location *bl) { int ret; struct cleanup *old_chain; @@ -4104,7 +4104,7 @@ remove_breakpoint (struct bp_location *bl, insertion_state_t is) switch_to_program_space_and_thread (bl->pspace); - ret = remove_breakpoint_1 (bl, is); + ret = remove_breakpoint_1 (bl, mark_uninserted); do_cleanups (old_chain); return ret; @@ -12609,7 +12609,7 @@ update_global_location_list (enum ugll_insert_mode insert_mode) if (!keep_in_target) { - if (remove_breakpoint (old_loc, mark_uninserted)) + if (remove_breakpoint (old_loc)) { /* This is just about all we can do. We could keep this location on the global list, and try to |