Skip to content

Commit 64e1513

Browse files
picnixzpicnixz
committed
use consistent '<mod>module_{methods,slots,def}' naming
1 parent 85ae8c3 commit 64e1513

6 files changed

Lines changed: 31 additions & 36 deletions

File tree

‎Modules/blake2module.c‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
static PyType_Spec blake2b_type_spec;
7070
static PyType_Spec blake2s_type_spec;
7171

72-
PyDoc_STRVAR(blake2mod__doc__,
72+
PyDoc_STRVAR(blake2module__doc__,
7373
"_blake2 provides BLAKE2b and BLAKE2s for hashlib\n");
7474

7575
typedef struct {
@@ -97,10 +97,6 @@ blake2_get_state_from_type(PyTypeObject *module)
9797
}
9898
#endif
9999

100-
static struct PyMethodDef blake2mod_functions[] = {
101-
{NULL, NULL}
102-
};
103-
104100
static int
105101
blake2module_traverse(PyObject *module, visitproc visit, void *arg)
106102
{
@@ -277,20 +273,19 @@ blake2module_exec(PyObject *m)
277273
return 0;
278274
}
279275

280-
static PyModuleDef_Slot _blake2_slots[] = {
276+
static PyModuleDef_Slot blake2module_slots[] = {
281277
{Py_mod_exec, blake2module_exec},
282278
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
283279
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
284280
{0, NULL}
285281
};
286282

287-
static struct PyModuleDef blake2_module = {
288-
.m_base = PyModuleDef_HEAD_INIT,
283+
static struct PyModuleDef blake2module_def = {
284+
PyModuleDef_HEAD_INIT,
289285
.m_name = "_blake2",
290-
.m_doc = blake2mod__doc__,
286+
.m_doc = blake2module__doc__,
291287
.m_size = sizeof(blake2module_state),
292-
.m_methods = blake2mod_functions,
293-
.m_slots = _blake2_slots,
288+
.m_slots = blake2module_slots,
294289
.m_traverse = blake2module_traverse,
295290
.m_clear = blake2module_clear,
296291
.m_free = blake2module_free,
@@ -299,7 +294,7 @@ static struct PyModuleDef blake2_module = {
299294
PyMODINIT_FUNC
300295
PyInit__blake2(void)
301296
{
302-
return PyModuleDef_Init(&blake2_module);
297+
return PyModuleDef_Init(&blake2module_def);
303298
}
304299

305300
// IMPLEMENTATION OF METHODS

‎Modules/hmacmodule.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,7 +1839,7 @@ static struct PyModuleDef_Slot hmacmodule_slots[] = {
18391839
{0, NULL} /* sentinel */
18401840
};
18411841

1842-
static struct PyModuleDef _hmacmodule = {
1842+
static struct PyModuleDef hmacmodule_def = {
18431843
PyModuleDef_HEAD_INIT,
18441844
.m_name = "_hmac",
18451845
.m_size = sizeof(hmacmodule_state),
@@ -1853,5 +1853,5 @@ static struct PyModuleDef _hmacmodule = {
18531853
PyMODINIT_FUNC
18541854
PyInit__hmac(void)
18551855
{
1856-
return PyModuleDef_Init(&_hmacmodule);
1856+
return PyModuleDef_Init(&hmacmodule_def);
18571857
}

‎Modules/md5module.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ _md5_md5_impl(PyObject *module, PyObject *data, int usedforsecurity,
336336

337337
/* List of functions exported by this module */
338338

339-
static struct PyMethodDef MD5_functions[] = {
339+
static struct PyMethodDef md5module_methods[] = {
340340
_MD5_MD5_METHODDEF
341341
{NULL, NULL} /* Sentinel */
342342
};
@@ -382,20 +382,20 @@ md5module_exec(PyObject *m)
382382
return 0;
383383
}
384384

385-
static PyModuleDef_Slot _md5_slots[] = {
385+
static PyModuleDef_Slot md5module_slots[] = {
386386
{Py_mod_exec, md5module_exec},
387387
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
388388
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
389389
{0, NULL}
390390
};
391391

392392

393-
static struct PyModuleDef _md5module = {
393+
static struct PyModuleDef md5module_def = {
394394
PyModuleDef_HEAD_INIT,
395395
.m_name = "_md5",
396396
.m_size = sizeof(md5module_state),
397-
.m_methods = MD5_functions,
398-
.m_slots = _md5_slots,
397+
.m_methods = md5module_methods,
398+
.m_slots = md5module_slots,
399399
.m_traverse = md5module_traverse,
400400
.m_clear = md5module_clear,
401401
.m_free = md5module_free,
@@ -404,5 +404,5 @@ static struct PyModuleDef _md5module = {
404404
PyMODINIT_FUNC
405405
PyInit__md5(void)
406406
{
407-
return PyModuleDef_Init(&_md5module);
407+
return PyModuleDef_Init(&md5module_def);
408408
}

‎Modules/sha1module.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ _sha1_sha1_impl(PyObject *module, PyObject *data, int usedforsecurity,
330330

331331
/* List of functions exported by this module */
332332

333-
static struct PyMethodDef SHA1_functions[] = {
333+
static struct PyMethodDef sha1module_methods[] = {
334334
_SHA1_SHA1_METHODDEF
335335
{NULL, NULL} /* Sentinel */
336336
};
@@ -383,19 +383,19 @@ sha1module_exec(PyObject *module)
383383

384384
/* Initialize this module. */
385385

386-
static PyModuleDef_Slot _sha1_slots[] = {
386+
static PyModuleDef_Slot sha1module_slots[] = {
387387
{Py_mod_exec, sha1module_exec},
388388
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
389389
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
390390
{0, NULL}
391391
};
392392

393-
static struct PyModuleDef _sha1module = {
393+
static struct PyModuleDef sha1module_def = {
394394
PyModuleDef_HEAD_INIT,
395395
.m_name = "_sha1",
396396
.m_size = sizeof(sha1module_state),
397-
.m_methods = SHA1_functions,
398-
.m_slots = _sha1_slots,
397+
.m_methods = sha1module_methods,
398+
.m_slots = sha1module_slots,
399399
.m_traverse = sha1module_traverse,
400400
.m_clear = sha1module_clear,
401401
.m_free = sha1module_free
@@ -404,5 +404,5 @@ static struct PyModuleDef _sha1module = {
404404
PyMODINIT_FUNC
405405
PyInit__sha1(void)
406406
{
407-
return PyModuleDef_Init(&_sha1module);
407+
return PyModuleDef_Init(&sha1module_def);
408408
}

‎Modules/sha2module.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ _sha2_sha384_impl(PyObject *module, PyObject *data, int usedforsecurity,
840840

841841
/* List of functions exported by this module */
842842

843-
static struct PyMethodDef SHA2_functions[] = {
843+
static struct PyMethodDef sha2module_methods[] = {
844844
_SHA2_SHA256_METHODDEF
845845
_SHA2_SHA224_METHODDEF
846846
_SHA2_SHA512_METHODDEF
@@ -926,19 +926,19 @@ sha2module_exec(PyObject *module)
926926
return 0;
927927
}
928928

929-
static PyModuleDef_Slot _sha2_slots[] = {
929+
static PyModuleDef_Slot sha2module_slots[] = {
930930
{Py_mod_exec, sha2module_exec},
931931
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
932932
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
933933
{0, NULL}
934934
};
935935

936-
static struct PyModuleDef _sha2module = {
936+
static struct PyModuleDef sha2module_def = {
937937
PyModuleDef_HEAD_INIT,
938938
.m_name = "_sha2",
939939
.m_size = sizeof(sha2module_state),
940-
.m_methods = SHA2_functions,
941-
.m_slots = _sha2_slots,
940+
.m_methods = sha2module_methods,
941+
.m_slots = sha2module_slots,
942942
.m_traverse = sha2module_traverse,
943943
.m_clear = sha2module_clear,
944944
.m_free = sha2module_free
@@ -947,5 +947,5 @@ static struct PyModuleDef _sha2module = {
947947
PyMODINIT_FUNC
948948
PyInit__sha2(void)
949949
{
950-
return PyModuleDef_Init(&_sha2module);
950+
return PyModuleDef_Init(&sha2module_def);
951951
}

‎Modules/sha3module.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -653,19 +653,19 @@ sha3module_exec(PyObject *m)
653653
return 0;
654654
}
655655

656-
static PyModuleDef_Slot _sha3_slots[] = {
656+
static PyModuleDef_Slot sha3module_slots[] = {
657657
{Py_mod_exec, sha3module_exec},
658658
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
659659
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
660660
{0, NULL}
661661
};
662662

663663
/* Initialize this module. */
664-
static struct PyModuleDef _sha3module = {
664+
static struct PyModuleDef sha3module_def = {
665665
PyModuleDef_HEAD_INIT,
666666
.m_name = "_sha3",
667667
.m_size = sizeof(sha3module_state),
668-
.m_slots = _sha3_slots,
668+
.m_slots = sha3module_slots,
669669
.m_traverse = sha3module_traverse,
670670
.m_clear = sha3module_clear,
671671
.m_free = sha3module_free,
@@ -675,5 +675,5 @@ static struct PyModuleDef _sha3module = {
675675
PyMODINIT_FUNC
676676
PyInit__sha3(void)
677677
{
678-
return PyModuleDef_Init(&_sha3module);
678+
return PyModuleDef_Init(&sha3module_def);
679679
}

0 commit comments

Comments
 (0)