summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Objects/typeobject.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index ca26d96..bc42e2d 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2857,19 +2857,18 @@ PyObject *
PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
{
PyHeapTypeObject *res;
- PyMemberDef *memb;
PyObject *modname;
PyTypeObject *type, *base;
- PyType_Slot *slot;
+ const PyType_Slot *slot;
Py_ssize_t nmembers, weaklistoffset, dictoffset;
- char *s, *res_start;
+ char *res_start;
nmembers = weaklistoffset = dictoffset = 0;
for (slot = spec->slots; slot->slot; slot++) {
if (slot->slot == Py_tp_members) {
nmembers = 0;
- for (memb = slot->pfunc; memb->name != NULL; memb++) {
+ for (const PyMemberDef *memb = slot->pfunc; memb->name != NULL; memb++) {
nmembers++;
if (strcmp(memb->name, "__weaklistoffset__") == 0) {
// The PyMemberDef must be a Py_ssize_t and readonly
@@ -2899,9 +2898,9 @@ PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
}
/* Set the type name and qualname */
- s = strrchr(spec->name, '.');
+ const char *s = strrchr(spec->name, '.');
if (s == NULL)
- s = (char*)spec->name;
+ s = spec->name;
else
s++;