Skip to content

Commit 85ed806

Browse files
committed
pythongh-111178: Fix function signatures in iterobject.c
1 parent 061da44 commit 85ed806

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

Objects/iterobject.c

+15-10
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,18 @@ PySeqIter_New(PyObject *seq)
3131
}
3232

3333
static void
34-
iter_dealloc(seqiterobject *it)
34+
iter_dealloc(PyObject *op)
3535
{
36+
seqiterobject *it = (seqiterobject*)op;
3637
_PyObject_GC_UNTRACK(it);
3738
Py_XDECREF(it->it_seq);
3839
PyObject_GC_Del(it);
3940
}
4041

4142
static int
42-
iter_traverse(seqiterobject *it, visitproc visit, void *arg)
43+
iter_traverse(PyObject *op, visitproc visit, void *arg)
4344
{
45+
seqiterobject *it = (seqiterobject*)op;
4446
Py_VISIT(it->it_seq);
4547
return 0;
4648
}
@@ -79,8 +81,9 @@ iter_iternext(PyObject *iterator)
7981
}
8082

8183
static PyObject *
82-
iter_len(seqiterobject *it, PyObject *Py_UNUSED(ignored))
84+
iter_len(PyObject *op, PyObject *Py_UNUSED(ignored))
8385
{
86+
seqiterobject *it = (seqiterobject*)op;
8487
Py_ssize_t seqsize, len;
8588

8689
if (it->it_seq) {
@@ -102,8 +105,9 @@ iter_len(seqiterobject *it, PyObject *Py_UNUSED(ignored))
102105
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
103106

104107
static PyObject *
105-
iter_reduce(seqiterobject *it, PyObject *Py_UNUSED(ignored))
108+
iter_reduce(PyObject *op, PyObject *Py_UNUSED(ignored))
106109
{
110+
seqiterobject *it = (seqiterobject*)op;
107111
PyObject *iter = _PyEval_GetBuiltin(&_Py_ID(iter));
108112

109113
/* _PyEval_GetBuiltin can invoke arbitrary code,
@@ -119,8 +123,9 @@ iter_reduce(seqiterobject *it, PyObject *Py_UNUSED(ignored))
119123
PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
120124

121125
static PyObject *
122-
iter_setstate(seqiterobject *it, PyObject *state)
126+
iter_setstate(PyObject *op, PyObject *state)
123127
{
128+
seqiterobject *it = (seqiterobject*)op;
124129
Py_ssize_t index = PyLong_AsSsize_t(state);
125130
if (index == -1 && PyErr_Occurred())
126131
return NULL;
@@ -135,9 +140,9 @@ iter_setstate(seqiterobject *it, PyObject *state)
135140
PyDoc_STRVAR(setstate_doc, "Set state information for unpickling.");
136141

137142
static PyMethodDef seqiter_methods[] = {
138-
{"__length_hint__", (PyCFunction)iter_len, METH_NOARGS, length_hint_doc},
139-
{"__reduce__", (PyCFunction)iter_reduce, METH_NOARGS, reduce_doc},
140-
{"__setstate__", (PyCFunction)iter_setstate, METH_O, setstate_doc},
143+
{"__length_hint__", iter_len, METH_NOARGS, length_hint_doc},
144+
{"__reduce__", iter_reduce, METH_NOARGS, reduce_doc},
145+
{"__setstate__", iter_setstate, METH_O, setstate_doc},
141146
{NULL, NULL} /* sentinel */
142147
};
143148

@@ -147,7 +152,7 @@ PyTypeObject PySeqIter_Type = {
147152
sizeof(seqiterobject), /* tp_basicsize */
148153
0, /* tp_itemsize */
149154
/* methods */
150-
(destructor)iter_dealloc, /* tp_dealloc */
155+
iter_dealloc, /* tp_dealloc */
151156
0, /* tp_vectorcall_offset */
152157
0, /* tp_getattr */
153158
0, /* tp_setattr */
@@ -164,7 +169,7 @@ PyTypeObject PySeqIter_Type = {
164169
0, /* tp_as_buffer */
165170
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
166171
0, /* tp_doc */
167-
(traverseproc)iter_traverse, /* tp_traverse */
172+
iter_traverse, /* tp_traverse */
168173
0, /* tp_clear */
169174
0, /* tp_richcompare */
170175
0, /* tp_weaklistoffset */

0 commit comments

Comments
 (0)