From 88b6faea9953505e9e8a7a77995c7db5dfb6ac19 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 11 Jan 2017 16:28:43 -0700 Subject: Use gdbpy_ref to simplify some logic This uses the new gdbpy_ref template to simplify logic in various parts of the Python layer; for example removing repeated error code or removing gotos. gdb/ChangeLog 2017-02-10 Tom Tromey * python/py-cmd.c (cmdpy_destroyer): Use gdbpy_ref. * python/py-breakpoint.c (gdbpy_breakpoint_deleted): Use gdbpy_ref. * python/py-type.c (field_new): Use gdbpy_ref. * python/py-symtab.c (symtab_and_line_to_sal_object): Use gdbpy_ref. * python/py-progspace.c (pspy_new): Use gdbpy_ref. (py_free_pspace): Likewise. (pspace_to_pspace_object): Likewise. * python/py-objfile.c (objfpy_new): Use gdbpy_ref. (py_free_objfile): Likewise. (objfile_to_objfile_object): Likewise. * python/py-inferior.c (delete_thread_object): Use gdbpy_ref. (infpy_read_memory): Likewise. (py_free_inferior): Likewise. * python/py-evtregistry.c (create_eventregistry_object): Use gdbpy_ref. * python/py-event.c (create_event_object): Use gdbpy_ref. --- gdb/python/py-evtregistry.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'gdb/python/py-evtregistry.c') diff --git a/gdb/python/py-evtregistry.c b/gdb/python/py-evtregistry.c index 81bf927..4d4045b 100644 --- a/gdb/python/py-evtregistry.c +++ b/gdb/python/py-evtregistry.c @@ -20,6 +20,7 @@ #include "defs.h" #include "command.h" #include "py-events.h" +#include "py-ref.h" events_object gdb_py_events; @@ -79,22 +80,18 @@ evregpy_disconnect (PyObject *self, PyObject *function) eventregistry_object * create_eventregistry_object (void) { - eventregistry_object *eventregistry_obj; + gdbpy_ref + eventregistry_obj (PyObject_New (eventregistry_object, + &eventregistry_object_type)); - eventregistry_obj = PyObject_New (eventregistry_object, - &eventregistry_object_type); - - if (!eventregistry_obj) + if (eventregistry_obj == NULL) return NULL; eventregistry_obj->callbacks = PyList_New (0); if (!eventregistry_obj->callbacks) - { - Py_DECREF (eventregistry_obj); - return NULL; - } + return NULL; - return eventregistry_obj; + return eventregistry_obj.release (); } static void -- cgit v1.1