diff options
| author | Tom Tromey <tom@tromey.com> | 2016-11-28 21:11:53 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-01-10 19:14:14 -0700 |
| commit | 1ac32117f7224620f44ac966b5ca53df6e4fc5bd (patch) | |
| tree | 0fab5bd8ccd089d8354229f495ab12deca558e5f /gdb/python | |
| parent | 0cf082277804ba3747be70a4013019f68b92bb84 (diff) | |
| download | gdb-1ac32117f7224620f44ac966b5ca53df6e4fc5bd.zip gdb-1ac32117f7224620f44ac966b5ca53df6e4fc5bd.tar.gz gdb-1ac32117f7224620f44ac966b5ca53df6e4fc5bd.tar.bz2 | |
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/python')
| -rw-r--r-- | gdb/python/python.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gdb/python/python.c b/gdb/python/python.c index d382d48..ab5a6a4 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -601,8 +601,7 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw) TRY { /* Copy the argument text in case the command modifies it. */ - char *copy = xstrdup (arg); - struct cleanup *cleanup = make_cleanup (xfree, copy); + std::string copy (arg); struct interp *interp; scoped_restore save_async = make_scoped_restore (¤t_ui->async, 0); @@ -614,12 +613,11 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw) interp = interp_lookup (current_ui, "console"); current_uiout = interp_ui_out (interp); - prevent_dont_repeat (); + scoped_restore preventer = prevent_dont_repeat (); if (to_string) - to_string_res = execute_command_to_string (copy, from_tty); + to_string_res = execute_command_to_string (©[0], from_tty); else - execute_command (copy, from_tty); - do_cleanups (cleanup); + execute_command (©[0], from_tty); } CATCH (except, RETURN_MASK_ALL) { |