Skip to content

Commit d8ea9e0

Browse files
committed
Use it in mmap, sha1, sha2, and sha3.
1 parent 21b3024 commit d8ea9e0

File tree

4 files changed

+5
-32
lines changed

4 files changed

+5
-32
lines changed

Modules/mmapmodule.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,6 @@ typedef struct {
128128

129129
#define mmap_object_CAST(op) ((mmap_object *)(op))
130130

131-
static int
132-
mmap_object_traverse(PyObject *op, visitproc visit, void *arg)
133-
{
134-
Py_VISIT(Py_TYPE(op));
135-
return 0;
136-
}
137-
138131
static void
139132
mmap_object_dealloc(PyObject *op)
140133
{
@@ -1499,7 +1492,7 @@ static PyType_Slot mmap_object_slots[] = {
14991492
{Py_tp_members, mmap_object_members},
15001493
{Py_tp_getset, mmap_object_getset},
15011494
{Py_tp_getattro, PyObject_GenericGetAttr},
1502-
{Py_tp_traverse, mmap_object_traverse},
1495+
{Py_tp_traverse, _PyObject_VisitType},
15031496

15041497
/* as sequence */
15051498
{Py_sq_length, mmap_length},

Modules/sha1module.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@ newSHA1object(SHA1State *st)
8181

8282

8383
/* Internal methods for a hash object */
84-
static int
85-
SHA1_traverse(PyObject *ptr, visitproc visit, void *arg)
86-
{
87-
Py_VISIT(Py_TYPE(ptr));
88-
return 0;
89-
}
9084

9185
static void
9286
SHA1_dealloc(PyObject *op)
@@ -247,7 +241,7 @@ static PyType_Slot sha1_type_slots[] = {
247241
{Py_tp_dealloc, SHA1_dealloc},
248242
{Py_tp_methods, SHA1_methods},
249243
{Py_tp_getset, SHA1_getseters},
250-
{Py_tp_traverse, SHA1_traverse},
244+
{Py_tp_traverse, _PyObject_VisitType},
251245
{0,0}
252246
};
253247

Modules/sha2module.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,6 @@ newSHA512object(sha2_state *state)
165165

166166
/* Internal methods for our hash objects. */
167167

168-
static int
169-
SHA2_traverse(PyObject *ptr, visitproc visit, void *arg)
170-
{
171-
Py_VISIT(Py_TYPE(ptr));
172-
return 0;
173-
}
174-
175168
static void
176169
SHA256_dealloc(PyObject *op)
177170
{
@@ -519,15 +512,15 @@ static PyType_Slot sha256_types_slots[] = {
519512
{Py_tp_dealloc, SHA256_dealloc},
520513
{Py_tp_methods, SHA256_methods},
521514
{Py_tp_getset, SHA256_getseters},
522-
{Py_tp_traverse, SHA2_traverse},
515+
{Py_tp_traverse, _PyObject_VisitType},
523516
{0,0}
524517
};
525518

526519
static PyType_Slot sha512_type_slots[] = {
527520
{Py_tp_dealloc, SHA512_dealloc},
528521
{Py_tp_methods, SHA512_methods},
529522
{Py_tp_getset, SHA512_getseters},
530-
{Py_tp_traverse, SHA2_traverse},
523+
{Py_tp_traverse, _PyObject_VisitType},
531524
{0,0}
532525
};
533526

Modules/sha3module.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,6 @@ SHA3_dealloc(PyObject *self)
226226
Py_DECREF(tp);
227227
}
228228

229-
static int
230-
SHA3_traverse(PyObject *self, visitproc visit, void *arg)
231-
{
232-
Py_VISIT(Py_TYPE(self));
233-
return 0;
234-
}
235-
236229
/* External methods for a hash object */
237230

238231

@@ -424,7 +417,7 @@ static PyGetSetDef SHA3_getseters[] = {
424417
static PyType_Slot type_slots_obj[] = { \
425418
{Py_tp_clear, SHA3_clear}, \
426419
{Py_tp_dealloc, SHA3_dealloc}, \
427-
{Py_tp_traverse, SHA3_traverse}, \
420+
{Py_tp_traverse, _PyObject_VisitType}, \
428421
{Py_tp_doc, (char*)type_doc}, \
429422
{Py_tp_methods, type_methods}, \
430423
{Py_tp_getset, type_getseters}, \

0 commit comments

Comments
 (0)