diff options
| author | Barry Warsaw <barry@python.org> | 2012-07-29 20:40:04 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2012-07-29 20:40:04 (GMT) |
| commit | dee609c09fb9a09d5e341e2f5975150016f85f00 (patch) | |
| tree | d2bed8f6bc932a2b4a6787827cb38cadbe92deba /Modules/_struct.c | |
| parent | dde56f4aa321edb293f64f0dfc519ef48b3dfece (diff) | |
| parent | a264384fe6de357680ca0cf02cd6024bbba0ba45 (diff) | |
| download | cpython-dee609c09fb9a09d5e341e2f5975150016f85f00.zip cpython-dee609c09fb9a09d5e341e2f5975150016f85f00.tar.gz cpython-dee609c09fb9a09d5e341e2f5975150016f85f00.tar.bz2 | |
merged
Diffstat (limited to 'Modules/_struct.c')
| -rw-r--r-- | Modules/_struct.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Modules/_struct.c b/Modules/_struct.c index 04692f0..0b20e26 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1756,15 +1756,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); } |