gh-111178: Fix function signatures in misc files (#131180)

diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 06a5afc52559c3cceb14e15ebc0951cf04454f67..57aa990941eb4bfedd276b8f4d433d0061379a12 100644 (file)
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -452,8 +452,9 @@ _io__Buffered___sizeof___impl(buffered *self)
 }
 
 static int
-buffered_traverse(buffered *self, visitproc visit, void *arg)
+buffered_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    buffered *self = buffered_CAST(op);
     Py_VISIT(Py_TYPE(self));
     Py_VISIT(self->raw);
     Py_VISIT(self->dict);
@@ -1481,8 +1482,9 @@ end:
 }
 
 static PyObject *
-buffered_iternext(buffered *self)
+buffered_iternext(PyObject *op)
 {
+    buffered *self = buffered_CAST(op);
     PyObject *line;
     PyTypeObject *tp;
 

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 5811835aa4f05eeb66f7c302e666f519467cd26c..c2ae33c0fcecc11dcb3b5322fdfe1b706ec9fdab 100644 (file)
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -7969,9 +7969,9 @@ pickle_clear(PyObject *m)
 }
 
 static void
-pickle_free(PyObject *m)
+pickle_free(void *m)
 {
-    _Pickle_ClearState(_Pickle_GetState(m));
+    _Pickle_ClearState(_Pickle_GetState((PyObject*)m));
 }
 
 static int
@@ -8077,7 +8077,7 @@ static struct PyModuleDef _picklemodule = {
     .m_slots = pickle_slots,
     .m_traverse = pickle_traverse,
     .m_clear = pickle_clear,
-    .m_free = (freefunc)pickle_free,
+    .m_free = pickle_free,
 };
 
 PyMODINIT_FUNC

diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index d423854b8ebff35d178ca99f7d39463b76a74d56..4862b24fa9331464e6744c2df7ad21b584eb6f06 100644 (file)
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -545,8 +545,9 @@ ThreadHandle_join(ThreadHandle *self, PyTime_t timeout_ns)
 }
 
 static int
-set_done(ThreadHandle *handle)
+set_done(void *arg)
 {
+    ThreadHandle *handle = (ThreadHandle*)arg;
     assert(get_thread_handle_state(handle) == THREAD_HANDLE_RUNNING);
     if (detach_thread(handle) < 0) {
         PyErr_SetString(ThreadError, "failed detaching handle");
@@ -564,7 +565,7 @@ ThreadHandle_set_done(ThreadHandle *self)
         return -1;
     }
 
-    if (_PyOnceFlag_CallOnce(&self->once, (_Py_once_fn_t *)set_done, self) ==
+    if (_PyOnceFlag_CallOnce(&self->once, set_done, self) ==
         -1) {
         return -1;
     }

diff --git a/Objects/typevarobject.c b/Objects/typevarobject.c
index 118d2546b818e64351dac1f2d411b7aa860958ba..258969c6fa4ba8c09de8d7f120c14334366c89ab 100644 (file)
--- a/Objects/typevarobject.c
+++ b/Objects/typevarobject.c
@@ -2254,15 +2254,17 @@ error:
 }
 
 static PyObject *
-generic_init_subclass(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
+generic_init_subclass(PyObject *cls, PyObject *args, PyObject *kwargs)
 {
-    return call_typing_args_kwargs("_generic_init_subclass", cls, args, kwargs);
+    return call_typing_args_kwargs("_generic_init_subclass",
+                                   (PyTypeObject*)cls, args, kwargs);
 }
 
 static PyObject *
-generic_class_getitem(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
+generic_class_getitem(PyObject *cls, PyObject *args, PyObject *kwargs)
 {
-    return call_typing_args_kwargs("_generic_class_getitem", cls, args, kwargs);
+    return call_typing_args_kwargs("_generic_class_getitem",
+                                   (PyTypeObject*)cls, args, kwargs);
 }
 
 PyObject *

diff --git a/Python/import.c b/Python/import.c
index 6836e13972ce3cc6735615129a2a8346712a05b1..78b380ca6e505c12f5b8926b63bbe47834f16e83 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -1146,8 +1146,9 @@ get_cached_m_dict(struct extensions_cache_value *value,
 }
 
 static void
-del_extensions_cache_value(struct extensions_cache_value *value)
+del_extensions_cache_value(void *raw)
 {
+    struct extensions_cache_value *value = raw;
     if (value != NULL) {
         del_cached_m_dict(value);
         del_cached_def(value);
@@ -1248,7 +1249,7 @@ _extensions_cache_init(void)
         hashtable_hash_str,
         hashtable_compare_str,
         hashtable_destroy_str,  // key
-        (_Py_hashtable_destroy_func)del_extensions_cache_value,  // value
+        del_extensions_cache_value,  // value
         &alloc
     );
     if (EXTENSIONS.hashtable == NULL) {