diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-10-07 03:54:51 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-10-07 03:54:51 (GMT) |
| commit | f2a67daca2206bab783abba99d428e5eaf36a8f7 (patch) | |
| tree | 1e3360c426729cd72381d1308f8989cd9ce3cbae /Objects/object.c | |
| parent | 0a1fc4e389b9839f2330083fb20e7a466835422f (diff) | |
| download | cpython-f2a67daca2206bab783abba99d428e5eaf36a8f7.zip cpython-f2a67daca2206bab783abba99d428e5eaf36a8f7.tar.gz cpython-f2a67daca2206bab783abba99d428e5eaf36a8f7.tar.bz2 | |
Guido suggests, and I agree, to insist that SIZEOF_VOID_P be a power of 2.
This simplifies the rounding in _PyObject_VAR_SIZE, allows to restore the
pre-rounding calling sequence, and allows some nice little simplifications
in its callers. I'm still making it return a size_t, though.
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Objects/object.c b/Objects/object.c index 0237234..be8eb07 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -130,9 +130,7 @@ PyVarObject * _PyObject_NewVar(PyTypeObject *tp, int nitems) { PyVarObject *op; - size_t size; - - _PyObject_VAR_SIZE(size, tp, nitems); + const size_t size = _PyObject_VAR_SIZE(tp, nitems); op = (PyVarObject *) PyObject_MALLOC(size); if (op == NULL) return (PyVarObject *)PyErr_NoMemory(); @@ -1158,8 +1156,8 @@ _PyObject_GetDictPtr(PyObject *obj) if (dictoffset == 0) return NULL; if (dictoffset < 0) { - size_t size; - _PyObject_VAR_SIZE(size, tp, ((PyVarObject *)obj)->ob_size); + const size_t size = _PyObject_VAR_SIZE(tp, + ((PyVarObject *)obj)->ob_size); dictoffset += (long)size; assert(dictoffset > 0); assert(dictoffset % SIZEOF_VOID_P == 0); |