This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA 14/14] Use gdbpy_reference in gdbpy_lookup_symbol
- 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:36 -0700
- Subject: [RFA 14/14] Use gdbpy_reference in gdbpy_lookup_symbol
- Authentication-results: sourceware.org; auth=none
- References: <1478497656-11832-1-git-send-email-tom@tromey.com>
This changes gdbpy_lookup_symbol to use gdbpy_reference.
2016-11-06 Tom Tromey <tom@tromey.com>
* python/py-symbol.c (gdbpy_lookup_symbol): Use gdbpy_reference.
---
gdb/ChangeLog | 4 ++++
gdb/python/py-symbol.c | 18 ++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 56fadac..6499a27 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2016-11-06 Tom Tromey <tom@tromey.com>
+ * python/py-symbol.c (gdbpy_lookup_symbol): Use gdbpy_reference.
+
+2016-11-06 Tom Tromey <tom@tromey.com>
+
* python/py-value.c (value_has_field, get_field_flag)
(get_field_type, valpy_getitem, convert_value_from_python): Use
gdbpy_reference.
diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c
index e0569d2..b0d92b2 100644
--- a/gdb/python/py-symbol.c
+++ b/gdb/python/py-symbol.c
@@ -23,6 +23,7 @@
#include "symtab.h"
#include "python-internal.h"
#include "objfiles.h"
+#include "py-ref.h"
typedef struct sympy_symbol_object {
PyObject_HEAD
@@ -374,7 +375,7 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw)
const char *name;
static char *keywords[] = { "name", "block", "domain", NULL };
struct symbol *symbol = NULL;
- PyObject *block_obj = NULL, *ret_tuple, *sym_obj, *bool_obj;
+ PyObject *block_obj = NULL, *sym_obj, *bool_obj;
const struct block *block = NULL;
if (! PyArg_ParseTupleAndKeywords (args, kw, "s|O!i", keywords, &name,
@@ -410,31 +411,28 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw)
}
END_CATCH
- ret_tuple = PyTuple_New (2);
- if (!ret_tuple)
+ gdbpy_reference ret_tuple (PyTuple_New (2));
+ if (ret_tuple == NULL)
return NULL;
if (symbol)
{
sym_obj = symbol_to_symbol_object (symbol);
if (!sym_obj)
- {
- Py_DECREF (ret_tuple);
- return NULL;
- }
+ return NULL;
}
else
{
sym_obj = Py_None;
Py_INCREF (Py_None);
}
- PyTuple_SET_ITEM (ret_tuple, 0, sym_obj);
+ PyTuple_SET_ITEM (ret_tuple.get (), 0, sym_obj);
bool_obj = (is_a_field_of_this.type != NULL) ? Py_True : Py_False;
Py_INCREF (bool_obj);
- PyTuple_SET_ITEM (ret_tuple, 1, bool_obj);
+ PyTuple_SET_ITEM (ret_tuple.get (), 1, bool_obj);
- return ret_tuple;
+ return ret_tuple.release ();
}
/* Implementation of
--
2.7.4