Skip to content

Commit 85ae8c3

Browse files
committed
use consistent '<mod>module_{exec,traverse,clear,free}' naming
1 parent 5b71796 commit 85ae8c3

5 files changed

Lines changed: 46 additions & 45 deletions

File tree

Modules/blake2module.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static struct PyMethodDef blake2mod_functions[] = {
102102
};
103103

104104
static int
105-
_blake2_traverse(PyObject *module, visitproc visit, void *arg)
105+
blake2module_traverse(PyObject *module, visitproc visit, void *arg)
106106
{
107107
blake2module_state *state = get_blake2module_state(module);
108108
Py_VISIT(state->blake2b_type);
@@ -111,7 +111,7 @@ _blake2_traverse(PyObject *module, visitproc visit, void *arg)
111111
}
112112

113113
static int
114-
_blake2_clear(PyObject *module)
114+
blake2module_clear(PyObject *module)
115115
{
116116
blake2module_state *state = get_blake2module_state(module);
117117
Py_CLEAR(state->blake2b_type);
@@ -120,9 +120,9 @@ _blake2_clear(PyObject *module)
120120
}
121121

122122
static void
123-
_blake2_free(void *module)
123+
blake2module_free(void *module)
124124
{
125-
(void)_blake2_clear((PyObject *)module);
125+
(void)blake2module_clear((PyObject *)module);
126126
}
127127

128128
static void
@@ -202,7 +202,7 @@ blake2module_init_cpu_features(blake2module_state *state)
202202
}
203203

204204
static int
205-
blake2_exec(PyObject *m)
205+
blake2module_exec(PyObject *m)
206206
{
207207
blake2module_state *state = get_blake2module_state(m);
208208
blake2module_init_cpu_features(state);
@@ -278,7 +278,7 @@ blake2_exec(PyObject *m)
278278
}
279279

280280
static PyModuleDef_Slot _blake2_slots[] = {
281-
{Py_mod_exec, blake2_exec},
281+
{Py_mod_exec, blake2module_exec},
282282
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
283283
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
284284
{0, NULL}
@@ -291,9 +291,9 @@ static struct PyModuleDef blake2_module = {
291291
.m_size = sizeof(blake2module_state),
292292
.m_methods = blake2mod_functions,
293293
.m_slots = _blake2_slots,
294-
.m_traverse = _blake2_traverse,
295-
.m_clear = _blake2_clear,
296-
.m_free = _blake2_free,
294+
.m_traverse = blake2module_traverse,
295+
.m_clear = blake2module_clear,
296+
.m_free = blake2module_free,
297297
};
298298

299299
PyMODINIT_FUNC

Modules/md5module.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -342,30 +342,30 @@ static struct PyMethodDef MD5_functions[] = {
342342
};
343343

344344
static int
345-
_md5_traverse(PyObject *module, visitproc visit, void *arg)
345+
md5module_traverse(PyObject *module, visitproc visit, void *arg)
346346
{
347347
md5module_state *state = get_md5module_state(module);
348348
Py_VISIT(state->md5_type);
349349
return 0;
350350
}
351351

352352
static int
353-
_md5_clear(PyObject *module)
353+
md5module_clear(PyObject *module)
354354
{
355355
md5module_state *state = get_md5module_state(module);
356356
Py_CLEAR(state->md5_type);
357357
return 0;
358358
}
359359

360360
static void
361-
_md5_free(void *module)
361+
md5module_free(void *module)
362362
{
363-
_md5_clear((PyObject *)module);
363+
(void)md5module_clear((PyObject *)module);
364364
}
365365

366366
/* Initialize this module. */
367367
static int
368-
md5_exec(PyObject *m)
368+
md5module_exec(PyObject *m)
369369
{
370370
md5module_state *state = get_md5module_state(m);
371371

@@ -383,7 +383,7 @@ md5_exec(PyObject *m)
383383
}
384384

385385
static PyModuleDef_Slot _md5_slots[] = {
386-
{Py_mod_exec, md5_exec},
386+
{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}
@@ -396,9 +396,9 @@ static struct PyModuleDef _md5module = {
396396
.m_size = sizeof(md5module_state),
397397
.m_methods = MD5_functions,
398398
.m_slots = _md5_slots,
399-
.m_traverse = _md5_traverse,
400-
.m_clear = _md5_clear,
401-
.m_free = _md5_free,
399+
.m_traverse = md5module_traverse,
400+
.m_clear = md5module_clear,
401+
.m_free = md5module_free,
402402
};
403403

404404
PyMODINIT_FUNC

Modules/sha1module.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -336,29 +336,29 @@ static struct PyMethodDef SHA1_functions[] = {
336336
};
337337

338338
static int
339-
_sha1_traverse(PyObject *module, visitproc visit, void *arg)
339+
sha1module_traverse(PyObject *module, visitproc visit, void *arg)
340340
{
341341
sha1module_state *state = get_sha1module_state(module);
342342
Py_VISIT(state->sha1_type);
343343
return 0;
344344
}
345345

346346
static int
347-
_sha1_clear(PyObject *module)
347+
sha1module_clear(PyObject *module)
348348
{
349349
sha1module_state *state = get_sha1module_state(module);
350350
Py_CLEAR(state->sha1_type);
351351
return 0;
352352
}
353353

354354
static void
355-
_sha1_free(void *module)
355+
sha1module_free(void *module)
356356
{
357-
(void)_sha1_clear((PyObject *)module);
357+
(void)sha1module_clear((PyObject *)module);
358358
}
359359

360360
static int
361-
_sha1_exec(PyObject *module)
361+
sha1module_exec(PyObject *module)
362362
{
363363
sha1module_state *state = get_sha1module_state(module);
364364

@@ -384,7 +384,7 @@ _sha1_exec(PyObject *module)
384384
/* Initialize this module. */
385385

386386
static PyModuleDef_Slot _sha1_slots[] = {
387-
{Py_mod_exec, _sha1_exec},
387+
{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}
@@ -396,9 +396,9 @@ static struct PyModuleDef _sha1module = {
396396
.m_size = sizeof(sha1module_state),
397397
.m_methods = SHA1_functions,
398398
.m_slots = _sha1_slots,
399-
.m_traverse = _sha1_traverse,
400-
.m_clear = _sha1_clear,
401-
.m_free = _sha1_free
399+
.m_traverse = sha1module_traverse,
400+
.m_clear = sha1module_clear,
401+
.m_free = sha1module_free
402402
};
403403

404404
PyMODINIT_FUNC

Modules/sha2module.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ static struct PyMethodDef SHA2_functions[] = {
849849
};
850850

851851
static int
852-
_sha2_traverse(PyObject *module, visitproc visit, void *arg)
852+
sha2module_traverse(PyObject *module, visitproc visit, void *arg)
853853
{
854854
sha2module_state *state = get_sha2module_state(module);
855855
Py_VISIT(state->sha224_type);
@@ -860,7 +860,7 @@ _sha2_traverse(PyObject *module, visitproc visit, void *arg)
860860
}
861861

862862
static int
863-
_sha2_clear(PyObject *module)
863+
sha2module_clear(PyObject *module)
864864
{
865865
sha2module_state *state = get_sha2module_state(module);
866866
Py_CLEAR(state->sha224_type);
@@ -871,13 +871,14 @@ _sha2_clear(PyObject *module)
871871
}
872872

873873
static void
874-
_sha2_free(void *module)
874+
sha2module_free(void *module)
875875
{
876-
(void)_sha2_clear((PyObject *)module);
876+
(void)sha2module_clear((PyObject *)module);
877877
}
878878

879879
/* Initialize this module. */
880-
static int sha2_exec(PyObject *module)
880+
static int
881+
sha2module_exec(PyObject *module)
881882
{
882883
sha2module_state *state = get_sha2module_state(module);
883884

@@ -926,7 +927,7 @@ static int sha2_exec(PyObject *module)
926927
}
927928

928929
static PyModuleDef_Slot _sha2_slots[] = {
929-
{Py_mod_exec, sha2_exec},
930+
{Py_mod_exec, sha2module_exec},
930931
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
931932
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
932933
{0, NULL}
@@ -938,9 +939,9 @@ static struct PyModuleDef _sha2module = {
938939
.m_size = sizeof(sha2module_state),
939940
.m_methods = SHA2_functions,
940941
.m_slots = _sha2_slots,
941-
.m_traverse = _sha2_traverse,
942-
.m_clear = _sha2_clear,
943-
.m_free = _sha2_free
942+
.m_traverse = sha2module_traverse,
943+
.m_clear = sha2module_clear,
944+
.m_free = sha2module_free
944945
};
945946

946947
PyMODINIT_FUNC

Modules/sha3module.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ SHA3_TYPE_SPEC(SHAKE256_spec, "shake_256", SHAKE256slots);
587587

588588

589589
static int
590-
_sha3_traverse(PyObject *module, visitproc visit, void *arg)
590+
sha3module_traverse(PyObject *module, visitproc visit, void *arg)
591591
{
592592
sha3module_state *state = get_sha3module_state(module);
593593
Py_VISIT(state->sha3_224_type);
@@ -600,7 +600,7 @@ _sha3_traverse(PyObject *module, visitproc visit, void *arg)
600600
}
601601

602602
static int
603-
_sha3_clear(PyObject *module)
603+
sha3module_clear(PyObject *module)
604604
{
605605
sha3module_state *state = get_sha3module_state(module);
606606
Py_CLEAR(state->sha3_224_type);
@@ -613,13 +613,13 @@ _sha3_clear(PyObject *module)
613613
}
614614

615615
static void
616-
_sha3_free(void *module)
616+
sha3module_free(void *module)
617617
{
618-
(void)_sha3_clear((PyObject *)module);
618+
(void)sha3module_clear((PyObject *)module);
619619
}
620620

621621
static int
622-
_sha3_exec(PyObject *m)
622+
sha3module_exec(PyObject *m)
623623
{
624624
sha3module_state *state = get_sha3module_state(m);
625625

@@ -654,7 +654,7 @@ _sha3_exec(PyObject *m)
654654
}
655655

656656
static PyModuleDef_Slot _sha3_slots[] = {
657-
{Py_mod_exec, _sha3_exec},
657+
{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}
@@ -666,9 +666,9 @@ static struct PyModuleDef _sha3module = {
666666
.m_name = "_sha3",
667667
.m_size = sizeof(sha3module_state),
668668
.m_slots = _sha3_slots,
669-
.m_traverse = _sha3_traverse,
670-
.m_clear = _sha3_clear,
671-
.m_free = _sha3_free,
669+
.m_traverse = sha3module_traverse,
670+
.m_clear = sha3module_clear,
671+
.m_free = sha3module_free,
672672
};
673673

674674

0 commit comments

Comments
 (0)