C++ify xmethod_worker, get rid of VEC(xmethod_worker_ptr)

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

diff --git a/gdb/python/py-exitedevent.c b/gdb/python/py-exitedevent.c
index 85ea2e2a81bca26dcdc39f853151e41459a2f4d8..4f861e3a086f6cc429a89f72e974c14e485fd5f0 100644 (file)
--- a/gdb/python/py-exitedevent.c
+++ b/gdb/python/py-exitedevent.c
@@ -1,6 +1,6 @@
 /* Python interface to inferior exit events.
 
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,38 +17,35 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include "defs.h"
 #include "py-event.h"
 
-static PyTypeObject exited_event_object_type;
-
 static PyObject *
 create_exited_event_object (const LONGEST *exit_code, struct inferior *inf)
 {
-  PyObject *exited_event;
-  PyObject *inf_obj;
-
-  exited_event = create_event_object (&exited_event_object_type);
+  gdbpy_ref<> exited_event (create_event_object (&exited_event_object_type));
 
-  if (!exited_event)
-    goto fail;
+  if (exited_event == NULL)
+    return NULL;
 
-  if (exit_code
-      && evpy_add_attribute (exited_event,
-                            "exit_code",
-                            PyLong_FromLongLong (*exit_code)) < 0)
-    goto fail;
+  if (exit_code)
+    {
+      gdbpy_ref<> exit_code_obj (PyLong_FromLongLong (*exit_code));
 
-  inf_obj = inferior_to_inferior_object (inf);
-  if (!inf_obj || evpy_add_attribute (exited_event,
-                                      "inferior",
-                                      inf_obj) < 0)
-    goto fail;
+      if (exit_code_obj == NULL)
+       return NULL;
+      if (evpy_add_attribute (exited_event.get (), "exit_code",
+                             exit_code_obj.get ()) < 0)
+       return NULL;
+    }
 
-  return exited_event;
+  gdbpy_ref<> inf_obj (inferior_to_inferior_object (inf));
+  if (inf_obj == NULL || evpy_add_attribute (exited_event.get (),
+                                            "inferior",
+                                            inf_obj.get ()) < 0)
+    return NULL;
 
-  fail:
-   Py_XDECREF (exited_event);
-   return NULL;
+  return exited_event.release ();
 }
 
 /* Callback that is used when an exit event occurs.  This function
@@ -57,23 +54,13 @@ create_exited_event_object (const LONGEST *exit_code, struct inferior *inf)
 int
 emit_exited_event (const LONGEST *exit_code, struct inferior *inf)
 {
-  PyObject *event;
-
   if (evregpy_no_listeners_p (gdb_py_events.exited))
     return 0;
 
-  event = create_exited_event_object (exit_code, inf);
+  gdbpy_ref<> event (create_exited_event_object (exit_code, inf));
 
-  if (event)
-    return evpy_emit_event (event, gdb_py_events.exited);
+  if (event != NULL)
+    return evpy_emit_event (event.get (), gdb_py_events.exited);
 
   return -1;
 }
-
-
-GDBPY_NEW_EVENT_TYPE (exited,
-                      "gdb.ExitedEvent",
-                      "ExitedEvent",
-                      "GDB exited event object",
-                      event_object_type,
-                      static);