This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Use gdbpy_ref in call_doc_function
- From: Tom Tromey <tromey at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 11 Jan 2017 05:19:27 -0000
- Subject: [binutils-gdb] Use gdbpy_ref in call_doc_function
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1bb44c9f567c75355c1b4417d88cda959e82a3a3
commit 1bb44c9f567c75355c1b4417d88cda959e82a3a3
Author: Tom Tromey <tom@tromey.com>
Date: Sun Nov 6 21:29:12 2016 -0700
Use gdbpy_ref in call_doc_function
This changes call_doc_function to use gdbpy_ref.
2017-01-10 Tom Tromey <tom@tromey.com>
* python/py-param.c (call_doc_function): Use gdbpy_ref.
Diff:
---
gdb/ChangeLog | 4 ++++
gdb/python/py-param.c | 11 +++++------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 849c3e1..a0bdd9c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2017-01-10 Tom Tromey <tom@tromey.com>
+ * python/py-param.c (call_doc_function): Use gdbpy_ref.
+
+2017-01-10 Tom Tromey <tom@tromey.com>
+
* python/py-linetable.c (build_line_table_tuple_from_pcs)
(ltpy_get_all_source_lines): Use gdbpy_ref.
diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c
index 7c3223f..d9d8baa 100644
--- a/gdb/python/py-param.c
+++ b/gdb/python/py-param.c
@@ -27,6 +27,7 @@
#include "completer.h"
#include "language.h"
#include "arch-utils.h"
+#include "py-ref.h"
/* Parameter constants and their values. */
struct parm_constant
@@ -329,15 +330,14 @@ static gdb::unique_xmalloc_ptr<char>
call_doc_function (PyObject *obj, PyObject *method, PyObject *arg)
{
gdb::unique_xmalloc_ptr<char> data;
- PyObject *result = PyObject_CallMethodObjArgs (obj, method, arg, NULL);
+ gdbpy_ref result (PyObject_CallMethodObjArgs (obj, method, arg, NULL));
- if (! result)
+ if (result == NULL)
return NULL;
- if (gdbpy_is_string (result))
+ if (gdbpy_is_string (result.get ()))
{
- data = python_string_to_host_string (result);
- Py_DECREF (result);
+ data = python_string_to_host_string (result.get ());
if (! data)
return NULL;
}
@@ -345,7 +345,6 @@ call_doc_function (PyObject *obj, PyObject *method, PyObject *arg)
{
PyErr_SetString (PyExc_RuntimeError,
_("Parameter must return a string value."));
- Py_DECREF (result);
return NULL;
}