FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove cleanups from execute_gdb_command

Browse source 
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.
This commit is contained in:
Tom Tromey 2016-11-28 21:11:53 -07:00
parent 0cf0822778
commit 1ac32117f7
6 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gdb/python/python.c
View file

@ -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 (&current_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 (&copy[0], from_tty);
else
execute_command (copy, from_tty);
do_cleanups (cleanup);
execute_command (&copy[0], from_tty);
}
CATCH (except, RETURN_MASK_ALL)
{