This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA 05/14] Use gdbpy_reference in py-function.c
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Sun, 6 Nov 2016 22:47:27 -0700
- Subject: [RFA 05/14] Use gdbpy_reference in py-function.c
- Authentication-results: sourceware.org; auth=none
- References: <1478497656-11832-1-git-send-email-tom@tromey.com>
This changes some code in py-function.c to use gdbpy_reference.
2016-11-06 Tom Tromey <tom@tromey.com>
* python/py-function.c (convert_values_to_python, fnpy_init): Use
gdbpy_reference.
---
gdb/ChangeLog | 5 +++++
gdb/python/py-function.c | 27 +++++++++++----------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1a0a21f..8271499 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2016-11-06 Tom Tromey <tom@tromey.com>
+ * python/py-function.c (convert_values_to_python, fnpy_init): Use
+ gdbpy_reference.
+
+2016-11-06 Tom Tromey <tom@tromey.com>
+
* python/py-cmd.c (gdbpy_string_to_argv): Use gdbpy_reference.
2016-11-06 Tom Tromey <tom@tromey.com>
diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c
index d42dbde..eb7b3c7 100644
--- a/gdb/python/py-function.c
+++ b/gdb/python/py-function.c
@@ -27,6 +27,7 @@
#include "completer.h"
#include "expression.h"
#include "language.h"
+#include "py-ref.h"
extern PyTypeObject fnpy_object_type
CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("PyObject");
@@ -37,22 +38,19 @@ static PyObject *
convert_values_to_python (int argc, struct value **argv)
{
int i;
- PyObject *result = PyTuple_New (argc);
+ gdbpy_reference result (PyTuple_New (argc));
- if (! result)
+ if (result == NULL)
return NULL;
for (i = 0; i < argc; ++i)
{
- PyObject *elt = value_to_value_object (argv[i]);
- if (! elt)
- {
- Py_DECREF (result);
- return NULL;
- }
- PyTuple_SetItem (result, i, elt);
+ gdbpy_reference elt (value_to_value_object (argv[i]));
+ if (elt == NULL)
+ return NULL;
+ PyTuple_SetItem (result.get (), i, elt.release ());
}
- return result;
+ return result.release ();
}
/* Call a Python function object's invoke method. */
@@ -173,21 +171,18 @@ fnpy_init (PyObject *self, PyObject *args, PyObject *kwds)
if (PyObject_HasAttrString (self, "__doc__"))
{
- PyObject *ds_obj = PyObject_GetAttrString (self, "__doc__");
+ gdbpy_reference ds_obj (PyObject_GetAttrString (self, "__doc__"));
if (ds_obj != NULL)
{
- if (gdbpy_is_string (ds_obj))
+ if (gdbpy_is_string (ds_obj.get ()))
{
- docstring = python_string_to_host_string (ds_obj);
+ docstring = python_string_to_host_string (ds_obj.get ());
if (docstring == NULL)
{
Py_DECREF (self);
- Py_DECREF (ds_obj);
return -1;
}
}
-
- Py_DECREF (ds_obj);
}
}
if (! docstring)
--
2.7.4