GDB 7.6.50

gdb/python/py-evts.c

 /* Python interface to inferior events.
 
-   Copyright (C) 2009-2012 Free Software Foundation, Inc.
+   Copyright (C) 2009-2013 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    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-events.h"
 
+#ifdef IS_PY3K
+static struct PyModuleDef EventModuleDef =
+{
+  PyModuleDef_HEAD_INIT,
+  "gdb.events",
+  NULL,
+  -1,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL
+};
+#endif
+
 /* Initialize python events.  */
 
-static int
+static int CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION
 add_new_registry (eventregistry_object **registryp, char *name)
 {
+  int result;
+
   *registryp = create_eventregistry_object ();
 
   if (*registryp == NULL)
-    goto fail;
+    return -1;
 
-  if (PyModule_AddObject (gdb_py_events.module,
-                             name,
-                             (PyObject *)(*registryp)) < 0)
-    goto fail;
+  return gdb_pymodule_addobject (gdb_py_events.module,
+                                 name,
+                                 (PyObject *)(*registryp));
+}
+
+int
+gdbpy_initialize_py_events (void)
+{
+#ifdef IS_PY3K
+  gdb_py_events.module = PyModule_Create (&EventModuleDef);
+#else
+  gdb_py_events.module = Py_InitModule ("events", NULL);
+#endif
+
+  if (!gdb_py_events.module)
+    return -1;
+
+  if (add_new_registry (&gdb_py_events.stop, "stop") < 0)
+    return -1;
+
+  if (add_new_registry (&gdb_py_events.cont, "cont") < 0)
+    return -1;
+
+  if (add_new_registry (&gdb_py_events.exited, "exited") < 0)
+    return -1;
+
+  if (add_new_registry (&gdb_py_events.new_objfile, "new_objfile") < 0)
+    return -1;
+
+  if (gdb_pymodule_addobject (gdb_module,
+                              "events",
+                              (PyObject *) gdb_py_events.module) < 0)
+    return -1;
 
   return 0;
-
-  fail:
-   Py_XDECREF (*registryp);
-   return -1;
 }
-
-void
-gdbpy_initialize_py_events (void)
-{
-  gdb_py_events.module = Py_InitModule ("events", NULL);
-
-  if (!gdb_py_events.module)
-    goto fail;
-
-  if (add_new_registry (&gdb_py_events.stop, "stop") < 0)
-    goto fail;
-
-  if (add_new_registry (&gdb_py_events.cont, "cont") < 0)
-    goto fail;
-
-  if (add_new_registry (&gdb_py_events.exited, "exited") < 0)
-    goto fail;
-
-  if (add_new_registry (&gdb_py_events.new_objfile, "new_objfile") < 0)
-    goto fail;
-
-  Py_INCREF (gdb_py_events.module);
-  if (PyModule_AddObject (gdb_module,
-                          "events",
-                          (PyObject *) gdb_py_events.module) < 0)
-    goto fail;
-
-  return;
-
-  fail:
-   gdbpy_print_stack ();
-}