From 90bc2dbccef5d74f0dd6875c555ee33187cfec37 Mon Sep 17 00:00:00 2001 From: Meador Inge Date: Sat, 28 Jul 2012 22:16:39 -0500 Subject: Issue #15402: Simplify Struct.__sizeof__ and make tests more precise. --- Modules/_struct.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Modules/_struct.c') diff --git a/Modules/_struct.c b/Modules/_struct.c index 0a09fd8a82..558d24bf8f 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1669,15 +1669,11 @@ PyDoc_STRVAR(s_sizeof__doc__, "S.__sizeof__() -> size of S in memory, in bytes"); static PyObject * -s_sizeof(PyStructObject *self) +s_sizeof(PyStructObject *self, void *unused) { Py_ssize_t size; - formatcode *code; - size = sizeof(PyStructObject) + sizeof(formatcode); - for (code = self->s_codes; code->fmtdef != NULL; code++) { - size += sizeof(formatcode); - } + size = sizeof(PyStructObject) + sizeof(formatcode) * (self->s_len + 1); return PyLong_FromSsize_t(size); } -- cgit v1.2.1