Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use struct member (ht_type) instead of casting pointers.

This commit is contained in:
Antoine Pitrou 2012-06-24 00:18:27 +02:00
parent 788306a9ab
commit bb78f57c14
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Objects/typeobject.c
View File

@ -2394,14 +2394,15 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
s++; s++;
if (res == NULL) if (res == NULL)
return NULL; return NULL;
type = &res->ht_type;
res->ht_name = PyUnicode_FromString(s); res->ht_name = PyUnicode_FromString(s);
if (!res->ht_name) if (!res->ht_name)
goto fail; goto fail;
res->ht_qualname = res->ht_name; res->ht_qualname = res->ht_name;
Py_INCREF(res->ht_qualname); Py_INCREF(res->ht_qualname);
res->ht_type.tp_name = spec->name; type->tp_name = spec->name;
if (!res->ht_type.tp_name) if (!type->tp_name)
goto fail; goto fail;
/* Adjust for empty tuple bases */ /* Adjust for empty tuple bases */
@ -2436,7 +2437,6 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
goto fail; goto fail;
} }
type = (PyTypeObject *)res;
/* Initialize essential fields */ /* Initialize essential fields */
type->tp_as_number = &res->as_number; type->tp_as_number = &res->as_number;
type->tp_as_sequence = &res->as_sequence; type->tp_as_sequence = &res->as_sequence;
@ -2448,9 +2448,9 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
Py_INCREF(base); Py_INCREF(base);
type->tp_base = base; type->tp_base = base;
res->ht_type.tp_basicsize = spec->basicsize; type->tp_basicsize = spec->basicsize;
res->ht_type.tp_itemsize = spec->itemsize; type->tp_itemsize = spec->itemsize;
res->ht_type.tp_flags = spec->flags | Py_TPFLAGS_HEAPTYPE; type->tp_flags = spec->flags | Py_TPFLAGS_HEAPTYPE;
for (slot = spec->slots; slot->slot; slot++) { for (slot = spec->slots; slot->slot; slot++) {
if (slot->slot >= Py_ARRAY_LENGTH(slotoffsets)) { if (slot->slot >= Py_ARRAY_LENGTH(slotoffsets)) {
@ -2470,20 +2470,20 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
if (tp_doc == NULL) if (tp_doc == NULL)
goto fail; goto fail;
memcpy(tp_doc, slot->pfunc, len); memcpy(tp_doc, slot->pfunc, len);
res->ht_type.tp_doc = tp_doc; type->tp_doc = tp_doc;
} }
} }
if (res->ht_type.tp_dictoffset) { if (type->tp_dictoffset) {
res->ht_cached_keys = _PyDict_NewKeysForClass(); res->ht_cached_keys = _PyDict_NewKeysForClass();
} }
if (res->ht_type.tp_dealloc == NULL) { if (type->tp_dealloc == NULL) {
/* It's a heap type, so needs the heap types' dealloc. /* It's a heap type, so needs the heap types' dealloc.
subtype_dealloc will call the base type's tp_dealloc, if subtype_dealloc will call the base type's tp_dealloc, if
necessary. */ necessary. */
res->ht_type.tp_dealloc = subtype_dealloc; type->tp_dealloc = subtype_dealloc;
} }
if (PyType_Ready(&res->ht_type) < 0) if (PyType_Ready(type) < 0)
goto fail; goto fail;
/* Set type.__module__ */ /* Set type.__module__ */