Skip to content

Commit 9a63138

Browse files
authored
pythongh-111178: Fix function signatures in misc files (python#131180)
1 parent e9d210b commit 9a63138

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

Modules/_io/bufferedio.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,9 @@ _io__Buffered___sizeof___impl(buffered *self)
452452
}
453453

454454
static int
455-
buffered_traverse(buffered *self, visitproc visit, void *arg)
455+
buffered_traverse(PyObject *op, visitproc visit, void *arg)
456456
{
457+
buffered *self = buffered_CAST(op);
457458
Py_VISIT(Py_TYPE(self));
458459
Py_VISIT(self->raw);
459460
Py_VISIT(self->dict);
@@ -1481,8 +1482,9 @@ _io__Buffered_truncate_impl(buffered *self, PyTypeObject *cls, PyObject *pos)
14811482
}
14821483

14831484
static PyObject *
1484-
buffered_iternext(buffered *self)
1485+
buffered_iternext(PyObject *op)
14851486
{
1487+
buffered *self = buffered_CAST(op);
14861488
PyObject *line;
14871489
PyTypeObject *tp;
14881490

Modules/_pickle.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -7969,9 +7969,9 @@ pickle_clear(PyObject *m)
79697969
}
79707970

79717971
static void
7972-
pickle_free(PyObject *m)
7972+
pickle_free(void *m)
79737973
{
7974-
_Pickle_ClearState(_Pickle_GetState(m));
7974+
_Pickle_ClearState(_Pickle_GetState((PyObject*)m));
79757975
}
79767976

79777977
static int
@@ -8077,7 +8077,7 @@ static struct PyModuleDef _picklemodule = {
80778077
.m_slots = pickle_slots,
80788078
.m_traverse = pickle_traverse,
80798079
.m_clear = pickle_clear,
8080-
.m_free = (freefunc)pickle_free,
8080+
.m_free = pickle_free,
80818081
};
80828082

80838083
PyMODINIT_FUNC

Modules/_threadmodule.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,9 @@ ThreadHandle_join(ThreadHandle *self, PyTime_t timeout_ns)
545545
}
546546

547547
static int
548-
set_done(ThreadHandle *handle)
548+
set_done(void *arg)
549549
{
550+
ThreadHandle *handle = (ThreadHandle*)arg;
550551
assert(get_thread_handle_state(handle) == THREAD_HANDLE_RUNNING);
551552
if (detach_thread(handle) < 0) {
552553
PyErr_SetString(ThreadError, "failed detaching handle");
@@ -564,7 +565,7 @@ ThreadHandle_set_done(ThreadHandle *self)
564565
return -1;
565566
}
566567

567-
if (_PyOnceFlag_CallOnce(&self->once, (_Py_once_fn_t *)set_done, self) ==
568+
if (_PyOnceFlag_CallOnce(&self->once, set_done, self) ==
568569
-1) {
569570
return -1;
570571
}

Objects/typevarobject.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -2254,15 +2254,17 @@ call_typing_args_kwargs(const char *name, PyTypeObject *cls, PyObject *args, PyO
22542254
}
22552255

22562256
static PyObject *
2257-
generic_init_subclass(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
2257+
generic_init_subclass(PyObject *cls, PyObject *args, PyObject *kwargs)
22582258
{
2259-
return call_typing_args_kwargs("_generic_init_subclass", cls, args, kwargs);
2259+
return call_typing_args_kwargs("_generic_init_subclass",
2260+
(PyTypeObject*)cls, args, kwargs);
22602261
}
22612262

22622263
static PyObject *
2263-
generic_class_getitem(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
2264+
generic_class_getitem(PyObject *cls, PyObject *args, PyObject *kwargs)
22642265
{
2265-
return call_typing_args_kwargs("_generic_class_getitem", cls, args, kwargs);
2266+
return call_typing_args_kwargs("_generic_class_getitem",
2267+
(PyTypeObject*)cls, args, kwargs);
22662268
}
22672269

22682270
PyObject *

Python/import.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -1146,8 +1146,9 @@ get_cached_m_dict(struct extensions_cache_value *value,
11461146
}
11471147

11481148
static void
1149-
del_extensions_cache_value(struct extensions_cache_value *value)
1149+
del_extensions_cache_value(void *raw)
11501150
{
1151+
struct extensions_cache_value *value = raw;
11511152
if (value != NULL) {
11521153
del_cached_m_dict(value);
11531154
del_cached_def(value);
@@ -1248,7 +1249,7 @@ _extensions_cache_init(void)
12481249
hashtable_hash_str,
12491250
hashtable_compare_str,
12501251
hashtable_destroy_str, // key
1251-
(_Py_hashtable_destroy_func)del_extensions_cache_value, // value
1252+
del_extensions_cache_value, // value
12521253
&alloc
12531254
);
12541255
if (EXTENSIONS.hashtable == NULL) {

0 commit comments

Comments
 (0)