Skip to content

gh-111178: Fix function signatures in iterobject.c #131163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2025
Merged

gh-111178: Fix function signatures in iterobject.c #131163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions Objects/iterobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,18 @@ PySeqIter_New(PyObject *seq)
}

static void
iter_dealloc(seqiterobject *it)
iter_dealloc(PyObject *op)
{
seqiterobject *it = (seqiterobject*)op;
_PyObject_GC_UNTRACK(it);
Py_XDECREF(it->it_seq);
PyObject_GC_Del(it);
}

static int
iter_traverse(seqiterobject *it, visitproc visit, void *arg)
iter_traverse(PyObject *op, visitproc visit, void *arg)
{
seqiterobject *it = (seqiterobject*)op;
Py_VISIT(it->it_seq);
return 0;
}
Expand Down Expand Up @@ -79,8 +81,9 @@ iter_iternext(PyObject *iterator)
}

static PyObject *
iter_len(seqiterobject *it, PyObject *Py_UNUSED(ignored))
iter_len(PyObject *op, PyObject *Py_UNUSED(ignored))
{
seqiterobject *it = (seqiterobject*)op;
Py_ssize_t seqsize, len;

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

static PyObject *
iter_reduce(seqiterobject *it, PyObject *Py_UNUSED(ignored))
iter_reduce(PyObject *op, PyObject *Py_UNUSED(ignored))
{
seqiterobject *it = (seqiterobject*)op;
PyObject *iter = _PyEval_GetBuiltin(&_Py_ID(iter));

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

static PyObject *
iter_setstate(seqiterobject *it, PyObject *state)
iter_setstate(PyObject *op, PyObject *state)
{
seqiterobject *it = (seqiterobject*)op;
Py_ssize_t index = PyLong_AsSsize_t(state);
if (index == -1 && PyErr_Occurred())
return NULL;
Expand All @@ -135,9 +140,9 @@ iter_setstate(seqiterobject *it, PyObject *state)
PyDoc_STRVAR(setstate_doc, "Set state information for unpickling.");

static PyMethodDef seqiter_methods[] = {
{"__length_hint__", (PyCFunction)iter_len, METH_NOARGS, length_hint_doc},
{"__reduce__", (PyCFunction)iter_reduce, METH_NOARGS, reduce_doc},
{"__setstate__", (PyCFunction)iter_setstate, METH_O, setstate_doc},
{"__length_hint__", iter_len, METH_NOARGS, length_hint_doc},
{"__reduce__", iter_reduce, METH_NOARGS, reduce_doc},
{"__setstate__", iter_setstate, METH_O, setstate_doc},
{NULL, NULL} /* sentinel */
};

Expand All @@ -147,7 +152,7 @@ PyTypeObject PySeqIter_Type = {
sizeof(seqiterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)iter_dealloc, /* tp_dealloc */
iter_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
Expand All @@ -164,7 +169,7 @@ PyTypeObject PySeqIter_Type = {
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
0, /* tp_doc */
(traverseproc)iter_traverse, /* tp_traverse */
iter_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
Expand Down
Loading