pythongh-111178: Fix function signatures for test_os (python#131227)

vstinner · plashchynski · commit 05c749a55dad · 2025-03-17T20:50:05.000+03:00
diff --git a/Modules/_queuemodule.c b/Modules/_queuemodule.c
@@ -272,8 +272,10 @@ typedef struct {
 } HandoffData;
 
 static void
-maybe_handoff_item(HandoffData *data, PyObject **item, int has_more_waiters)
+maybe_handoff_item(void *arg, void *park_arg, int has_more_waiters)
 {
+    HandoffData *data = (HandoffData*)arg;
+    PyObject **item = (PyObject**)park_arg;
     if (item == NULL) {
         // No threads were waiting
         data->handed_off = false;
@@ -313,7 +315,7 @@ _queue_SimpleQueue_put_impl(simplequeueobject *self, PyObject *item,
     if (self->has_threads_waiting) {
         // Try to hand the item off directly if there are threads waiting
         _PyParkingLot_Unpark(&self->has_threads_waiting,
-                             (_Py_unpark_fn_t *)maybe_handoff_item, &data);
+                             maybe_handoff_item, &data);
     }
     if (!data.handed_off) {
         if (RingBuf_Put(&self->buf, item) < 0) {
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -1731,8 +1731,9 @@ idna_cleanup(struct maybe_idna *data)
 }
 
 static int
-idna_converter(PyObject *obj, struct maybe_idna *data)
+idna_converter(PyObject *obj, void *arg)
 {
+    struct maybe_idna *data = (struct maybe_idna*)arg;
     size_t len;
     PyObject *obj2;
     if (obj == NULL) {
diff --git a/Objects/structseq.c b/Objects/structseq.c
@@ -334,8 +334,9 @@ structseq_repr(PyObject *op)
 
 
 static PyObject *
-structseq_reduce(PyStructSequence* self, PyObject *Py_UNUSED(ignored))
+structseq_reduce(PyObject *op, PyObject *Py_UNUSED(ignored))
 {
+    PyStructSequence *self = (PyStructSequence*)op;
     PyObject* tup = NULL;
     PyObject* dict = NULL;
     PyObject* result;
@@ -379,8 +380,9 @@ structseq_reduce(PyStructSequence* self, PyObject *Py_UNUSED(ignored))
 
 
 static PyObject *
-structseq_replace(PyStructSequence *self, PyObject *args, PyObject *kwargs)
+structseq_replace(PyObject *op, PyObject *args, PyObject *kwargs)
 {
+    PyStructSequence *self = (PyStructSequence*)op;
     PyStructSequence *result = NULL;
     Py_ssize_t n_fields, n_unnamed_fields, i;
 
@@ -449,7 +451,7 @@ structseq_replace(PyStructSequence *self, PyObject *args, PyObject *kwargs)
 }
 
 static PyMethodDef structseq_methods[] = {
-    {"__reduce__", (PyCFunction)structseq_reduce, METH_NOARGS, NULL},
+    {"__reduce__", structseq_reduce, METH_NOARGS, NULL},
     {"__replace__", _PyCFunction_CAST(structseq_replace), METH_VARARGS | METH_KEYWORDS,
      PyDoc_STR("__replace__($self, /, **changes)\n--\n\n"
         "Return a copy of the structure with new values for the specified fields.")},

Original file line number	Diff line number	Diff line change
`@@ -1731,8 +1731,9 @@ idna_cleanup(struct maybe_idna *data)`
`1731`	`1731`	`}`
`1732`	`1732`
`1733`	`1733`	`static int`
`1734`		`-idna_converter(PyObject obj, struct maybe_idna data)`
	`1734`	`+idna_converter(PyObject obj, void arg)`
`1735`	`1735`	`{`
	`1736`	`+ struct maybe_idna data = (struct maybe_idna)arg;`
`1736`	`1737`	`size_t len;`
`1737`	`1738`	`PyObject *obj2;`
`1738`	`1739`	`if (obj == NULL) {`