Stackless issue python#265: fix the signature of tp_clear functions

Return type is 'int', not 'void'.
akruis · Jun 9, 2021 · d822483 · d822483
1 parent 233e873
commit d822483
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/Stackless/core/cframeobject.c b/Stackless/core/cframeobject.c
@@ -66,7 +66,7 @@ cframe_traverse(PyCFrameObject *cf, visitproc visit, void *arg)
 
 /* clearing a cframe while the object still exists */
 
-static void
+static int
 cframe_clear(PyCFrameObject *cf)
 {
     /* The Python C-API documentation recomends to use Py_CLEAR() to release
@@ -86,6 +86,7 @@ cframe_clear(PyCFrameObject *cf)
     Py_XDECREF(tmp_ob1);
     Py_XDECREF(tmp_ob2);
     Py_XDECREF(tmp_ob3);
+    return 0;
 }
 
 

diff --git a/Stackless/module/channelobject.c b/Stackless/module/channelobject.c
@@ -56,7 +56,7 @@ channel_traverse(PyChannelObject *ch, visitproc visit, void *arg)
     return 0;
 }
 
-static void
+static int
 channel_clear(PyObject *ob)
 {
     PyChannelObject *ch = (PyChannelObject *) ob;
@@ -74,6 +74,7 @@ channel_clear(PyObject *ob)
         ob = (PyObject *) slp_channel_remove(ch, NULL, NULL, NULL);
         Py_DECREF(ob);
     }
+    return 0;
 }
 
 static void

diff --git a/Stackless/module/scheduling.c b/Stackless/module/scheduling.c
@@ -42,12 +42,13 @@ bomb_traverse(PyBombObject *bomb, visitproc visit, void *arg)
     return 0;
 }
 
-static void
+static int
 bomb_clear(PyBombObject *bomb)
 {
     Py_CLEAR(bomb->curexc_type);
     Py_CLEAR(bomb->curexc_value);
     Py_CLEAR(bomb->curexc_traceback);
+    return 0;
 }
 
 PyBombObject *

diff --git a/Stackless/module/taskletobject.c b/Stackless/module/taskletobject.c
@@ -197,7 +197,7 @@ exc_state_clear(_PyErr_StackItem *exc_state)
     Py_XDECREF(tb);
 }
 
-static void
+static int
 tasklet_clear(PyTaskletObject *t)
 {
     tasklet_clear_frames(t);
@@ -219,6 +219,7 @@ tasklet_clear(PyTaskletObject *t)
      * the order of calls to tp_clear is undefined.
      */
     t->exc_info = &t->exc_state;
+    return 0;
 }
 
 /*

diff --git a/Stackless/pickling/prickelpit.c b/Stackless/pickling/prickelpit.c
@@ -129,12 +129,13 @@ _wrap_traverse(PyObject *ob, visitproc visit, void *arg)
     return ret;
 }
 
-static void
+static int
 _wrap_clear(PyObject *ob)
 {
     Py_TYPE(ob) = Py_TYPE(ob)->tp_base;
     if (Py_TYPE(ob)->tp_clear != NULL)
         Py_TYPE(ob)->tp_clear(ob);
+    return 0;
 }