From 2865bfce3875fa16046b0a987d98ab19fc8bbb9a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 12 Nov 2016 11:23:36 -0700 Subject: [PATCH] Use gdbpy_enter in py-param.c This converts the remaining functions in py-param.c to use gdbpy_enter. 2017-01-10 Tom Tromey * python/py-param.c (get_set_value, get_show_value): Use gdbpy_enter, gdbpy_ref. --- gdb/ChangeLog | 5 +++ gdb/python/py-param.c | 75 ++++++++++++++++++++----------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 010fa0ca02b..618150cfc50 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-01-10 Tom Tromey + + * python/py-param.c (get_set_value, get_show_value): Use + gdbpy_enter, gdbpy_ref. + 2017-01-10 Tom Tromey * python/py-function.c (fnpy_call): Use gdbpy_enter, gdbpy_ref. diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c index d9d8baaf350..b692824ae1f 100644 --- a/gdb/python/py-param.c +++ b/gdb/python/py-param.c @@ -363,18 +363,24 @@ get_set_value (char *args, int from_tty, { PyObject *obj = (PyObject *) get_cmd_context (c); gdb::unique_xmalloc_ptr set_doc_string; - struct cleanup *cleanup = ensure_python_env (get_current_arch (), - current_language); - PyObject *set_doc_func = PyString_FromString ("get_set_string"); - if (! set_doc_func) - goto error; + gdbpy_enter enter_py (get_current_arch (), current_language); + gdbpy_ref set_doc_func (PyString_FromString ("get_set_string")); - if (PyObject_HasAttr (obj, set_doc_func)) + if (set_doc_func == NULL) { - set_doc_string = call_doc_function (obj, set_doc_func, NULL); + gdbpy_print_stack (); + return; + } + + if (PyObject_HasAttr (obj, set_doc_func.get ())) + { + set_doc_string = call_doc_function (obj, set_doc_func.get (), NULL); if (! set_doc_string) - goto error; + { + gdbpy_print_stack (); + return; + } } else { @@ -385,16 +391,6 @@ get_set_value (char *args, int from_tty, } fprintf_filtered (gdb_stdout, "%s\n", set_doc_string.get ()); - - Py_XDECREF (set_doc_func); - do_cleanups (cleanup); - return; - - error: - Py_XDECREF (set_doc_func); - gdbpy_print_stack (); - do_cleanups (cleanup); - return; } /* A callback function that is registered against the respective @@ -410,24 +406,33 @@ get_show_value (struct ui_file *file, int from_tty, { PyObject *obj = (PyObject *) get_cmd_context (c); gdb::unique_xmalloc_ptr show_doc_string; - struct cleanup *cleanup = ensure_python_env (get_current_arch (), - current_language); - PyObject *show_doc_func = PyString_FromString ("get_show_string"); - if (! show_doc_func) - goto error; + gdbpy_enter enter_py (get_current_arch (), current_language); + gdbpy_ref show_doc_func (PyString_FromString ("get_show_string")); + + if (show_doc_func == NULL) + { + gdbpy_print_stack (); + return; + } - if (PyObject_HasAttr (obj, show_doc_func)) + if (PyObject_HasAttr (obj, show_doc_func.get ())) { - PyObject *val_obj = PyString_FromString (value); + gdbpy_ref val_obj (PyString_FromString (value)); - if (! val_obj) - goto error; + if (val_obj == NULL) + { + gdbpy_print_stack (); + return; + } - show_doc_string = call_doc_function (obj, show_doc_func, val_obj); - Py_DECREF (val_obj); + show_doc_string = call_doc_function (obj, show_doc_func.get (), + val_obj.get ()); if (! show_doc_string) - goto error; + { + gdbpy_print_stack (); + return; + } fprintf_filtered (file, "%s\n", show_doc_string.get ()); } @@ -439,16 +444,6 @@ get_show_value (struct ui_file *file, int from_tty, show_doc_string = get_doc_string (obj, show_doc_cst); fprintf_filtered (file, "%s %s\n", show_doc_string.get (), value); } - - Py_XDECREF (show_doc_func); - do_cleanups (cleanup); - return; - - error: - Py_XDECREF (show_doc_func); - gdbpy_print_stack (); - do_cleanups (cleanup); - return; } -- 2.30.2