aboutsummaryrefslogtreecommitdiff
path: root/gdb/breakpoint.c
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-01-23 18:58:33 +0000
committerPedro Alves <palves@redhat.com>2019-01-23 19:05:50 +0000
commit694c6bf5425024a8654a5541dec88e4dd6ddafb5 (patch)
tree41d60d864814e18ddffe9477d443d7edd1f85d2a /gdb/breakpoint.c
parent4c41382ac101f10071f92074bab7c33242ef5b15 (diff)
downloadgdb-694c6bf5425024a8654a5541dec88e4dd6ddafb5.zip
gdb-694c6bf5425024a8654a5541dec88e4dd6ddafb5.tar.gz
gdb-694c6bf5425024a8654a5541dec88e4dd6ddafb5.tar.bz2
Remove make_bpstat_clear_actions_cleanup
This removes make_bpstat_clear_actions_cleanup, replacing it with uses of scope_exit. gdb/ChangeLog: 2019-01-23 Tom Tromey <tom@tromey.com> Andrew Burgess <andrew.burgess@embecosm.com> Pedro Alves <palves@redhat.com> * infrun.c (fetch_inferior_event): Use scope_exit. * utils.h (make_bpstat_clear_actions_cleanup): Don't declare. * top.c (execute_command): Use scope_exit. * breakpoint.c (bpstat_do_actions): Use scope_exit. * utils.c (do_bpstat_clear_actions_cleanup) (make_bpstat_clear_actions_cleanup): Remove.
Diffstat (limited to 'gdb/breakpoint.c')
-rw-r--r--gdb/breakpoint.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 33c5bfe..f9dd194 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4468,7 +4468,7 @@ get_bpstat_thread ()
void
bpstat_do_actions (void)
{
- struct cleanup *cleanup_if_error = make_bpstat_clear_actions_cleanup ();
+ auto cleanup_if_error = make_scope_exit (bpstat_clear_actions);
thread_info *tp;
/* Do any commands attached to breakpoint we are stopped at. */
@@ -4482,7 +4482,7 @@ bpstat_do_actions (void)
break;
}
- discard_cleanups (cleanup_if_error);
+ cleanup_if_error.release ();
}
/* Print out the (old or new) value associated with a watchpoint. */