Automatic date update in version.in

[deliverable/binutils-gdb.git] / gdb / python / py-threadevent.c

diff --git a/gdb/python/py-threadevent.c b/gdb/python/py-threadevent.c
index f78dc6412cc41e494bab3ed43b426838972b9c3c..968a157578a152b67e7087d70ca8541f01c9d016 100644 (file)
--- a/gdb/python/py-threadevent.c
+++ b/gdb/python/py-threadevent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -47,34 +47,24 @@ get_event_thread (void)
   return thread;
 }
 
-PyObject *
-create_thread_event_object (PyTypeObject *py_type)
+gdbpy_ref<>
+create_thread_event_object (PyTypeObject *py_type, PyObject *thread)
 {
-  PyObject *thread = NULL;
-  PyObject *thread_event_obj = NULL;
-
-  thread_event_obj = create_event_object (py_type);
-  if (!thread_event_obj)
-    goto fail;
+  gdbpy_ref<> thread_event_obj (create_event_object (py_type));
+  if (thread_event_obj == NULL)
+    return NULL;
 
-  thread = get_event_thread ();
-  if (!thread)
-    goto fail;
+  if (thread == NULL)
+    {
+      thread = get_event_thread ();
+      if (!thread)
+       return NULL;
+    }
 
-  if (evpy_add_attribute (thread_event_obj,
+  if (evpy_add_attribute (thread_event_obj.get (),
                           "inferior_thread",
                           thread) < 0)
-    goto fail;
+    return NULL;
 
   return thread_event_obj;
-
-  fail:
-   Py_XDECREF (thread_event_obj);
-   return NULL;
 }
-
-GDBPY_NEW_EVENT_TYPE (thread,
-                      "gdb.ThreadEvent",
-                      "ThreadEvent",
-                      "GDB thread event object",
-                      event_object_type);