[binutils-gdb] Use gdbpy_enter in py-cmd.c
Tom Tromey
tromey@sourceware.org
Wed Jan 11 05:20:00 GMT 2017
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6ba0cd406511d3edbe643f5e599d79538febedc5
commit 6ba0cd406511d3edbe643f5e599d79538febedc5
Author: Tom Tromey <tom@tromey.com>
Date: Mon Nov 7 16:02:16 2016 -0700
Use gdbpy_enter in py-cmd.c
Change py-cmd.c to use gdbpy_enter.
2017-01-10 Tom Tromey <tom@tromey.com>
* python/py-cmd.c (cmdpy_destroyer)
(cmdpy_completer_handle_brkchars, cmdpy_completer): Use
gdbpy_enter.
Diff:
---
gdb/ChangeLog | 6 ++++++
gdb/python/py-cmd.c | 13 +++----------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fb156a9..f02b235 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2017-01-10 Tom Tromey <tom@tromey.com>
+ * python/py-cmd.c (cmdpy_destroyer)
+ (cmdpy_completer_handle_brkchars, cmdpy_completer): Use
+ gdbpy_enter.
+
+2017-01-10 Tom Tromey <tom@tromey.com>
+
* python/py-breakpoint.c (gdbpy_breakpoint_cond_says_stop): Use
gdbpy_enter.
(gdbpy_breakpoint_has_cond): Likewise.
diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index e2879b7..9afa7e4 100644
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -96,9 +96,8 @@ static void
cmdpy_destroyer (struct cmd_list_element *self, void *context)
{
cmdpy_object *cmd;
- struct cleanup *cleanup;
- cleanup = ensure_python_env (get_current_arch (), current_language);
+ gdbpy_enter enter_py (get_current_arch (), current_language);
/* Release our hold on the command object. */
cmd = (cmdpy_object *) context;
@@ -110,8 +109,6 @@ cmdpy_destroyer (struct cmd_list_element *self, void *context)
xfree ((char *) self->name);
xfree ((char *) self->doc);
xfree ((char *) self->prefixname);
-
- do_cleanups (cleanup);
}
/* Called by gdb to invoke the command. */
@@ -287,9 +284,8 @@ cmdpy_completer_handle_brkchars (struct cmd_list_element *command,
const char *text, const char *word)
{
PyObject *resultobj = NULL;
- struct cleanup *cleanup;
- cleanup = ensure_python_env (get_current_arch (), current_language);
+ gdbpy_enter enter_py (get_current_arch (), current_language);
/* Calling our helper to obtain the PyObject of the Python
function. */
@@ -324,7 +320,6 @@ cmdpy_completer_handle_brkchars (struct cmd_list_element *command,
done:
Py_XDECREF (resultobj);
- do_cleanups (cleanup);
}
/* Called by gdb for command completion. */
@@ -335,9 +330,8 @@ cmdpy_completer (struct cmd_list_element *command,
{
PyObject *resultobj = NULL;
VEC (char_ptr) *result = NULL;
- struct cleanup *cleanup;
- cleanup = ensure_python_env (get_current_arch (), current_language);
+ gdbpy_enter enter_py (get_current_arch (), current_language);
/* Calling our helper to obtain the PyObject of the Python
function. */
@@ -404,7 +398,6 @@ cmdpy_completer (struct cmd_list_element *command,
done:
Py_XDECREF (resultobj);
- do_cleanups (cleanup);
return result;
}
More information about the Gdb-cvs
mailing list