Skip to content

bpo-47196: Fix function pointer cast in test_imp #32244

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 2 commits into from
Apr 2, 2022
Merged

bpo-47196: Fix function pointer cast in test_imp #32244

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6debb72
bpo-47196: Fix function pointer cast in test_imp
hoodmane Apr 1, 2022
9a6291f
Remove the spec args from the rest of the modules in _testmultiphase.c
hoodmane Apr 2, 2022
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
48 changes: 24 additions & 24 deletions Modules/_testmultiphase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ static PyModuleDef_Slot main_slots[] = {
static PyModuleDef main_def = TEST_MODULE_DEF("main", main_slots, testexport_methods);

PyMODINIT_FUNC
PyInit__testmultiphase(PyObject *spec)
PyInit__testmultiphase(void)
{
return PyModuleDef_Init(&main_def);
}
Expand Down Expand Up @@ -495,7 +495,7 @@ static PyModuleDef def_nonmodule = TEST_MODULE_DEF(
"_testmultiphase_nonmodule", slots_create_nonmodule, NULL);

PyMODINIT_FUNC
PyInit__testmultiphase_nonmodule(PyObject *spec)
PyInit__testmultiphase_nonmodule(void)
{
return PyModuleDef_Init(&def_nonmodule);
}
Expand Down Expand Up @@ -525,7 +525,7 @@ static PyModuleDef def_nonmodule_with_methods = TEST_MODULE_DEF(
"_testmultiphase_nonmodule_with_methods", slots_create_nonmodule, nonmodule_methods);

PyMODINIT_FUNC
PyInit__testmultiphase_nonmodule_with_methods(PyObject *spec)
PyInit__testmultiphase_nonmodule_with_methods(void)
{
return PyModuleDef_Init(&def_nonmodule_with_methods);
}
Expand All @@ -545,7 +545,7 @@ static PyModuleDef def_nonascii_latin = { \
};

PyMODINIT_FUNC
PyInitU__testmultiphase_zkouka_naten_evc07gi8e(PyObject *spec)
PyInitU__testmultiphase_zkouka_naten_evc07gi8e(void)
{
return PyModuleDef_Init(&def_nonascii_latin);
}
Expand All @@ -563,15 +563,15 @@ static PyModuleDef def_nonascii_kana = { \
};

PyMODINIT_FUNC
PyInitU_eckzbwbhc6jpgzcx415x(PyObject *spec)
PyInitU_eckzbwbhc6jpgzcx415x(void)
{
return PyModuleDef_Init(&def_nonascii_kana);
}

/*** Module with a single-character name ***/

PyMODINIT_FUNC
PyInit_x(PyObject *spec)
PyInit_x(void)
{
return PyModuleDef_Init(&main_def);
}
Expand All @@ -582,7 +582,7 @@ static PyModuleDef null_slots_def = TEST_MODULE_DEF(
"_testmultiphase_null_slots", NULL, NULL);

PyMODINIT_FUNC
PyInit__testmultiphase_null_slots(PyObject *spec)
PyInit__testmultiphase_null_slots(void)
{
return PyModuleDef_Init(&null_slots_def);
}
Expand All @@ -598,7 +598,7 @@ static PyModuleDef def_bad_large = TEST_MODULE_DEF(
"_testmultiphase_bad_slot_large", slots_bad_large, NULL);

PyMODINIT_FUNC
PyInit__testmultiphase_bad_slot_large(PyObject *spec)
PyInit__testmultiphase_bad_slot_large(void)
{
return PyModuleDef_Init(&def_bad_large);
}
Expand All @@ -612,7 +612,7 @@ static PyModuleDef def_bad_negative = TEST_MODULE_DEF(
"_testmultiphase_bad_slot_negative", slots_bad_negative, NULL);

PyMODINIT_FUNC
PyInit__testmultiphase_bad_slot_negative(PyObject *spec)
PyInit__testmultiphase_bad_slot_negative(void)
{
return PyModuleDef_Init(&def_bad_negative);
}
Expand All @@ -630,7 +630,7 @@ static PyModuleDef def_create_int_with_state = { \
};

PyMODINIT_FUNC
PyInit__testmultiphase_create_int_with_state(PyObject *spec)
PyInit__testmultiphase_create_int_with_state(void)
{
return PyModuleDef_Init(&def_create_int_with_state);
}
Expand All @@ -649,7 +649,7 @@ static PyModuleDef def_negative_size = { \
};

PyMODINIT_FUNC
PyInit__testmultiphase_negative_size(PyObject *spec)
PyInit__testmultiphase_negative_size(void)
{
return PyModuleDef_Init(&def_negative_size);
}
Expand All @@ -658,26 +658,26 @@ PyInit__testmultiphase_negative_size(PyObject *spec)
static PyModuleDef uninitialized_def = TEST_MODULE_DEF("main", main_slots, testexport_methods);

PyMODINIT_FUNC
PyInit__testmultiphase_export_uninitialized(PyObject *spec)
PyInit__testmultiphase_export_uninitialized(void)
{
return (PyObject*) &uninitialized_def;
}

PyMODINIT_FUNC
PyInit__testmultiphase_export_null(PyObject *spec)
PyInit__testmultiphase_export_null(void)
{
return NULL;
}

PyMODINIT_FUNC
PyInit__testmultiphase_export_raise(PyObject *spec)
PyInit__testmultiphase_export_raise(void)
{
PyErr_SetString(PyExc_SystemError, "bad export function");
return NULL;
}

PyMODINIT_FUNC
PyInit__testmultiphase_export_unreported_exception(PyObject *spec)
PyInit__testmultiphase_export_unreported_exception(void)
{
PyErr_SetString(PyExc_SystemError, "bad export function");
return PyModuleDef_Init(&main_def);
Expand All @@ -698,7 +698,7 @@ static PyModuleDef def_create_null = TEST_MODULE_DEF(
"_testmultiphase_create_null", slots_create_null, NULL);

PyMODINIT_FUNC
PyInit__testmultiphase_create_null(PyObject *spec)
PyInit__testmultiphase_create_null(void)
{
return PyModuleDef_Init(&def_create_null);
}
Expand All @@ -719,7 +719,7 @@ static PyModuleDef def_create_raise = TEST_MODULE_DEF(
"_testmultiphase_create_null", slots_create_raise, NULL);

PyMODINIT_FUNC
PyInit__testmultiphase_create_raise(PyObject *spec)
PyInit__testmultiphase_create_raise(void)
{
return PyModuleDef_Init(&def_create_raise);
}
Expand All @@ -740,7 +740,7 @@ static PyModuleDef def_create_unreported_exception = TEST_MODULE_DEF(
"_testmultiphase_create_unreported_exception", slots_create_unreported_exception, NULL);

PyMODINIT_FUNC
PyInit__testmultiphase_create_unreported_exception(PyObject *spec)
PyInit__testmultiphase_create_unreported_exception(void)
{
return PyModuleDef_Init(&def_create_unreported_exception);
}
Expand All @@ -755,7 +755,7 @@ static PyModuleDef def_nonmodule_with_exec_slots = TEST_MODULE_DEF(
"_testmultiphase_nonmodule_with_exec_slots", slots_nonmodule_with_exec_slots, NULL);

PyMODINIT_FUNC
PyInit__testmultiphase_nonmodule_with_exec_slots(PyObject *spec)
PyInit__testmultiphase_nonmodule_with_exec_slots(void)
{
return PyModuleDef_Init(&def_nonmodule_with_exec_slots);
}
Expand All @@ -775,7 +775,7 @@ static PyModuleDef def_exec_err = TEST_MODULE_DEF(
"_testmultiphase_exec_err", slots_exec_err, NULL);

PyMODINIT_FUNC
PyInit__testmultiphase_exec_err(PyObject *spec)
PyInit__testmultiphase_exec_err(void)
{
return PyModuleDef_Init(&def_exec_err);
}
Expand Down Expand Up @@ -817,7 +817,7 @@ static PyModuleDef def_exec_unreported_exception = TEST_MODULE_DEF(
"_testmultiphase_exec_unreported_exception", slots_exec_unreported_exception, NULL);

PyMODINIT_FUNC
PyInit__testmultiphase_exec_unreported_exception(PyObject *spec)
PyInit__testmultiphase_exec_unreported_exception(void)
{
return PyModuleDef_Init(&def_exec_unreported_exception);
}
Expand Down Expand Up @@ -861,7 +861,7 @@ static PyModuleDef def_meth_state_access = {
};

PyMODINIT_FUNC
PyInit__testmultiphase_meth_state_access(PyObject *spec)
PyInit__testmultiphase_meth_state_access(void)
{
return PyModuleDef_Init(&def_meth_state_access);
}
Expand All @@ -874,7 +874,7 @@ static PyModuleDef def_module_state_shared = {
};

PyMODINIT_FUNC
PyInit__test_module_state_shared(PyObject *spec)
PyInit__test_module_state_shared(void)
{
PyObject *module = PyModule_Create(&def_module_state_shared);
if (module == NULL) {
Expand All @@ -894,7 +894,7 @@ PyInit__test_module_state_shared(PyObject *spec)
static PyModuleDef imp_dummy_def = TEST_MODULE_DEF("imp_dummy", main_slots, testexport_methods);

PyMODINIT_FUNC
PyInit_imp_dummy(PyObject *spec)
PyInit_imp_dummy(void)
{
return PyModuleDef_Init(&imp_dummy_def);
}
Expand Down