summaryrefslogtreecommitdiff
path: root/gdb/top.c
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2016-11-28 21:11:53 -0700
committerTom Tromey <tom@tromey.com>2017-01-10 19:14:14 -0700
commit1ac32117f7224620f44ac966b5ca53df6e4fc5bd (patch)
tree0fab5bd8ccd089d8354229f495ab12deca558e5f /gdb/top.c
parent0cf082277804ba3747be70a4013019f68b92bb84 (diff)
Remove cleanups from execute_gdb_command
This replaces a cleanup in execute_gdb_command with an instance of std::string. Testing showed that this originally missed a cleanup that was returned by prevent_dont_repeat. This version of the patch changes prevent_dont_repeat to return a scoped_restore rather than a cleanup. 2017-01-10 Tom Tromey <tom@tromey.com> * top.c (prevent_dont_repeat): Change return type. * python/python.c (execute_gdb_command): Use std::string. Update. * guile/guile.c (gdbscm_execute_gdb_command): Update. * command.h (prevent_dont_repeat): Change return type. * breakpoint.c (bpstat_do_actions_1): Update.
Diffstat (limited to 'gdb/top.c')
-rw-r--r--gdb/top.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/gdb/top.c b/gdb/top.c
index ef8d8565d3..f712beafb6 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -755,13 +755,10 @@ dont_repeat (void)
/* Prevent dont_repeat from working, and return a cleanup that
restores the previous state. */
-struct cleanup *
+scoped_restore_tmpl<int>
prevent_dont_repeat (void)
{
- struct cleanup *result = make_cleanup_restore_integer (&suppress_dont_repeat);
-
- suppress_dont_repeat = 1;
- return result;
+ return make_scoped_restore (&suppress_dont_repeat, 1);
}