gh-111178: Fix function signatures for test_iter (#131456)

diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 7028c1ad9d1b94abefacb430f4b46d28ac79959d..2189b1f3800415c7728c396cfc0c56be0ab8842f 100644 (file)
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -1524,8 +1524,9 @@ buffered_iternext(PyObject *op)
 }
 
 static PyObject *
-buffered_repr(buffered *self)
+buffered_repr(PyObject *op)
 {
+    buffered *self = buffered_CAST(op);
     PyObject *nameobj, *res;
 
     if (PyObject_GetOptionalAttr((PyObject *) self, &_Py_ID(name), &nameobj) < 0) {

diff --git a/Modules/_sre/sre.c b/Modules/_sre/sre.c
index 0e614d99ad35a43d3b49eb23b8bf86a9731ff861..b0eb9d131c64698997b985a9ac657c69b61affee 100644 (file)
--- a/Modules/_sre/sre.c
+++ b/Modules/_sre/sre.c
@@ -2710,8 +2710,9 @@ match_regs_get(PyObject *op, void *Py_UNUSED(ignored))
 }
 
 static PyObject *
-match_repr(MatchObject *self)
+match_repr(PyObject *op)
 {
+    MatchObject *self = _MatchObject_CAST(op);
     PyObject *result;
     PyObject *group0 = match_getslice_by_index(self, 0, Py_None);
     if (group0 == NULL)

diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
index 24ea0441d8110135f6f0dcb6b55c7d59da0469ab..8e6bc31a05e13430c8d1d1f79f3e6ea3628be140 100644 (file)
--- a/Objects/genericaliasobject.c
+++ b/Objects/genericaliasobject.c
@@ -885,7 +885,9 @@ static PyNumberMethods ga_as_number = {
 };
 
 static PyObject *
-ga_iternext(gaiterobject *gi) {
+ga_iternext(PyObject *op)
+{
+    gaiterobject *gi = (gaiterobject*)op;
     if (gi->obj == NULL) {
         PyErr_SetNone(PyExc_StopIteration);
         return NULL;
@@ -901,21 +903,25 @@ ga_iternext(gaiterobject *gi) {
 }
 
 static void
-ga_iter_dealloc(gaiterobject *gi) {
+ga_iter_dealloc(PyObject *op)
+{
+    gaiterobject *gi = (gaiterobject*)op;
     PyObject_GC_UnTrack(gi);
     Py_XDECREF(gi->obj);
     PyObject_GC_Del(gi);
 }
 
 static int
-ga_iter_traverse(gaiterobject *gi, visitproc visit, void *arg)
+ga_iter_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    gaiterobject *gi = (gaiterobject*)op;
     Py_VISIT(gi->obj);
     return 0;
 }
 
 static int
-ga_iter_clear(PyObject *self) {
+ga_iter_clear(PyObject *self)
+{
     gaiterobject *gi = (gaiterobject *)self;
     Py_CLEAR(gi->obj);
     return 0;
@@ -949,11 +955,11 @@ PyTypeObject _Py_GenericAliasIterType = {
     .tp_name = "generic_alias_iterator",
     .tp_basicsize = sizeof(gaiterobject),
     .tp_iter = PyObject_SelfIter,
-    .tp_iternext = (iternextfunc)ga_iternext,
-    .tp_traverse = (traverseproc)ga_iter_traverse,
+    .tp_iternext = ga_iternext,
+    .tp_traverse = ga_iter_traverse,
     .tp_methods = ga_iter_methods,
-    .tp_dealloc = (destructor)ga_iter_dealloc,
-    .tp_clear = (inquiry)ga_iter_clear,
+    .tp_dealloc = ga_iter_dealloc,
+    .tp_clear = ga_iter_clear,
     .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
 };
 

diff --git a/Objects/iterobject.c b/Objects/iterobject.c
index 8b33a7ded3ffd6a60f68ea69da74f870fbd92b13..8693e0458d0e67b09c8cd68c98d55cc10f090073 100644 (file)
--- a/Objects/iterobject.c
+++ b/Objects/iterobject.c
@@ -210,8 +210,9 @@ calliter_dealloc(PyObject *op)
 }
 
 static int
-calliter_traverse(calliterobject *it, visitproc visit, void *arg)
+calliter_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    calliterobject *it = (calliterobject*)op;
     Py_VISIT(it->it_callable);
     Py_VISIT(it->it_sentinel);
     return 0;
@@ -294,7 +295,7 @@ PyTypeObject PyCallIter_Type = {
     0,                                          /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,    /* tp_flags */
     0,                                          /* tp_doc */
-    (traverseproc)calliter_traverse,            /* tp_traverse */
+    calliter_traverse,                          /* tp_traverse */
     0,                                          /* tp_clear */
     0,                                          /* tp_richcompare */
     0,                                          /* tp_weaklistoffset */