Merge in the main branch

python · encukou · Mar 24, 2025 · Dec 18, 2024 · Jan 9, 2025 · Jan 10, 2025
commit bb41481aec160b1b0209202cc655f251377fe294
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
@@ -173,7 +173,7 @@ PyCField_new_impl(PyTypeObject *type, PyObject *name, PyObject *proto,
        }
    }

-    self = (CFieldObject *)type->tp_alloc(type, 0);
+    self = _CFieldObject_CAST(type->tp_alloc(type, 0));
    if (!self) {
        return NULL;
    }
@@ -260,15 +260,15 @@ PyCField_set(PyObject *op, PyObject *inst, PyObject *value)
                        "not a ctype instance");
        return -1;
    }
-    dst = (CDataObject *)inst;
+    dst = _CDataObject_CAST(inst);
    ptr = dst->b_ptr + self->byte_offset;
    if (value == NULL) {
        PyErr_SetString(PyExc_TypeError,
                        "can't delete attribute");
        return -1;
    }
    return PyCData_set(st, inst, self->proto, self->setfunc, value,
-                     self->index, _pack_legacy_size(self), ptr);
+                       self->index, _pack_legacy_size(self), ptr);
 }

 static PyObject *
@@ -287,21 +287,21 @@ PyCField_get(PyObject *op, PyObject *inst, PyTypeObject *type)
    }
    src = _CDataObject_CAST(inst);
    return PyCData_get(st, self->proto, self->getfunc, inst,
-                     self->index, _pack_legacy_size(self),
-                     src->b_ptr + self->byte_offset);
+                       self->index, _pack_legacy_size(self),
+                       src->b_ptr + self->byte_offset);
 }

 static PyObject *
 PyCField_get_legacy_size(PyObject *self, void *data)
 {
-    CFieldObject *field = (CFieldObject *)self;
+    CFieldObject *field = _CFieldObject_CAST(self);
    return PyLong_FromSsize_t(_pack_legacy_size(field));
 }

 static PyObject *
 PyCField_get_bit_size(PyObject *self, void *data)
 {
-    CFieldObject *field = (CFieldObject *)self;
+    CFieldObject *field = _CFieldObject_CAST(self);
    if (field->bitfield_size) {
        return PyLong_FromSsize_t(field->bitfield_size);
    }
@@ -325,15 +325,13 @@ PyCField_get_bit_size(PyObject *self, void *data)
 static PyObject *
 PyCField_is_bitfield(PyObject *self, void *data)
 {
-    CFieldObject *field = (CFieldObject *)self;
-    return PyBool_FromLong(field->bitfield_size);
+    return PyBool_FromLong(_CFieldObject_CAST(self)->bitfield_size);
 }

 static PyObject *
 PyCField_is_anonymous(PyObject *self, void *data)
 {
-    CFieldObject *field = (CFieldObject *)self;
-    return PyBool_FromLong(field->anonymous);
+    return PyBool_FromLong(_CFieldObject_CAST(self)->anonymous);
 }

 static PyGetSetDef PyCField_getset[] = {
@@ -417,7 +415,7 @@ PyCField_dealloc(PyObject *self)
 static PyObject *
 PyCField_repr(PyObject *self)
 {
-    CFieldObject *field = (CFieldObject *)self;
+    CFieldObject *field = _CFieldObject_CAST(self);
    PyObject *result;
    const char *tp_name = ((PyTypeObject *)field->proto)->tp_name;