fix compilation errors

Author: picnixz

Modules/_ctypes/_ctypes.c

@@ -168,13 +168,12 @@ _DictRemover_clear(PyObject *myself)
 }
 
 static void
-_DictRemover_dealloc(PyObject *myself)
+_DictRemover_dealloc(PyObject *self)
 {
-    PyTypeObject *tp = Py_TYPE(myself);
-    DictRemoverObject *self = _DictRemoverObject_CAST(myself);
-    PyObject_GC_UnTrack(myself);
+    PyTypeObject *tp = Py_TYPE(self);
+    PyObject_GC_UnTrack(self);
     (void)_DictRemover_clear(self);
-    tp->tp_free(myself);
+    tp->tp_free(self);
     Py_DECREF(tp);
 }
 
@@ -416,22 +415,21 @@ StructParam_traverse(PyObject *self, visitproc visit, void *arg)
 }
 
 static int
-StructParam_clear(PyObject *op)
+StructParam_clear(PyObject *myself)
 {
-    StructParamObject *self = _StructParamObject_CAST(op);
+    StructParamObject *self = _StructParamObject_CAST(myself);
     Py_CLEAR(self->keep);
     return 0;
 }
 
 static void
-StructParam_dealloc(PyObject *myself)
+StructParam_dealloc(PyObject *self)
 {
-    StructParamObject *self = _StructParamObject_CAST(myself);
     PyTypeObject *tp = Py_TYPE(self);
-    PyObject_GC_UnTrack(myself);
+    PyObject_GC_UnTrack(self);
     (void)StructParam_clear(self);
-    PyMem_Free(self->ptr);
-    tp->tp_free(myself);
+    PyMem_Free(_StructParamObject_CAST(self)->ptr);
+    tp->tp_free(self);
     Py_DECREF(tp);
 }
 
@@ -1417,8 +1415,6 @@ static PyType_Spec pycpointer_type_spec = {
   attribute, and a _type_ attribute.
 */
 
-#define _CDataObject_CAST(op)   ((CDataObject *)(op))
-
 static int
 CharArray_set_raw(PyObject *op, PyObject *value, void *Py_UNUSED(ignored))
 {
@@ -3262,10 +3258,7 @@ PyObject *
 PyCData_get(ctypes_state *st, PyObject *type, GETFUNC getfunc, PyObject *src,
           Py_ssize_t index, Py_ssize_t size, char *adr)
 {
-#ifdef Py_GIL_DISABLED
-    // This isn't used if the GIL is enabled, so it causes a compiler warning.
-    CDataObject *cdata = (CDataObject *)src;
-#endif
+    CDataObject *cdata = _CDataObject_CAST(src);
     if (getfunc) {
         PyObject *res;
         LOCK_PTR(cdata);
@@ -3490,8 +3483,6 @@ generic_pycdata_new(ctypes_state *st,
   PyCFuncPtr_Type
 */
 
-#define _PyCFuncPtrObject_CAST(op)  ((PyCFuncPtrObject *)(op))
-
 /*[clinic input]
 @critical_section
 @setter
@@ -4585,7 +4576,7 @@ PyCFuncPtr_clear(PyObject *op)
     Py_CLEAR(self->converters);
     Py_CLEAR(self->paramflags);
     Py_CLEAR(self->thunk);
-    return PyCData_clear(self);
+    return PyCData_clear(op);
 }
 
 static void
@@ -5525,6 +5516,7 @@ Pointer_new(PyTypeObject *type, PyObject *args, PyObject *kw)
 static PyObject *
 Pointer_subscript(PyObject *myself, PyObject *item)
 {
+    CDataObject *self = _CDataObject_CAST(myself);
     if (PyIndex_Check(item)) {
         Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
         if (i == -1 && PyErr_Occurred())
@@ -5602,7 +5594,7 @@ Pointer_subscript(PyObject *myself, PyObject *item)
         }
         assert(iteminfo);
         if (iteminfo->getfunc == _ctypes_get_fielddesc("c")->getfunc) {
-            char *ptr = locked_deref(_CDataObject_CAST(myself));
+            char *ptr = locked_deref(self);
             char *dest;
 
             if (len <= 0)
@@ -5628,7 +5620,7 @@ Pointer_subscript(PyObject *myself, PyObject *item)
             return np;
         }
         if (iteminfo->getfunc == _ctypes_get_fielddesc("u")->getfunc) {
-            wchar_t *ptr = locked_deref(_CDataObject_CAST(myself));
+            wchar_t *ptr = locked_deref(self);
             wchar_t *dest;
 
             if (len <= 0)

Modules/_ctypes/callproc.c

@@ -477,8 +477,6 @@ check_hresult(PyObject *self, PyObject *args)
 
 /**************************************************************/
 
-#define _PyCArgObject_CAST(op)  ((PyCArgObject *)(op))
-
 PyCArgObject *
 PyCArgObject_new(ctypes_state *st)
 {
@@ -528,7 +526,7 @@ is_literal_char(unsigned char c)
 }
 
 static PyObject *
-PyCArg_repr(PyObject *self)
+PyCArg_repr(PyObject *op)
 {
     PyCArgObject *self = _PyCArgObject_CAST(op);
     switch(self->tag) {

Modules/_ctypes/cfield.c

@@ -42,8 +42,6 @@ static void pymem_destructor(PyObject *ptr)
   PyCField_Type
 */
 
-#define _CFieldObject_CAST(op)  ((CFieldObject *)(op))
-
 /*[clinic input]
 class _ctypes.CField "PyObject *" "PyObject"
 [clinic start generated code]*/
@@ -208,7 +206,7 @@ PyCField_set(PyObject *op, PyObject *inst, PyObject *value)
                         "not a ctype instance");
         return -1;
     }
-    dst = _CFieldObject_CAST(inst);
+    dst = _CDataObject_CAST(inst);
     ptr = dst->b_ptr + self->offset;
     if (value == NULL) {
         PyErr_SetString(PyExc_TypeError,
@@ -233,7 +231,7 @@ PyCField_get(PyObject *op, PyObject *inst, PyTypeObject *type)
                         "not a ctype instance");
         return NULL;
     }
-    src = _CFieldObject_CAST(inst);
+    src = _CDataObject_CAST(inst);
     return PyCData_get(st, self->proto, self->getfunc, inst,
                        self->index, self->size, src->b_ptr + self->offset);
 }

Modules/_ctypes/ctypes.h

@@ -112,7 +112,10 @@ extern PyType_Spec cfield_spec;
 extern PyType_Spec cthunk_spec;
 
 typedef struct tagPyCArgObject PyCArgObject;
+#define _PyCArgObject_CAST(op)  ((PyCArgObject *)(op))
+
 typedef struct tagCDataObject CDataObject;
+#define _CDataObject_CAST(op)   ((CDataObject *)(op))
 
 // GETFUNC: convert the C value at *ptr* to Python object, return the object
 // SETFUNC: write content of the PyObject *value* to the location at *ptr*;
@@ -176,6 +179,7 @@ typedef struct {
     ffi_type *ffi_restype;
     ffi_type *atypes[1];
 } CThunkObject;
+#define _CThunkObject_CAST(op)          ((CThunkObject *)(op))
 #define CThunk_CheckExact(st, v)        Py_IS_TYPE(v, st->PyCThunk_Type)
 
 typedef struct {
@@ -208,6 +212,7 @@ typedef struct {
 #endif
     PyObject *paramflags;
 } PyCFuncPtrObject;
+#define _PyCFuncPtrObject_CAST(op)  ((PyCFuncPtrObject *)(op))
 
 extern int PyCStructUnionType_update_stginfo(PyObject *fields, PyObject *type, int isStruct);
 extern int PyType_stginfo(PyTypeObject *self, Py_ssize_t *psize, Py_ssize_t *palign, Py_ssize_t *plength);
@@ -268,6 +273,7 @@ typedef struct CFieldObject {
 
     PyObject *name;                     /* exact PyUnicode */
 } CFieldObject;
+#define _CFieldObject_CAST(op)  ((CFieldObject *)(op))
 
 /****************************************************************
  StgInfo
@@ -404,6 +410,7 @@ struct tagPyCArgObject {
     PyObject *obj;
     Py_ssize_t size; /* for the 'V' tag */
 };
+#define _PyCArgObject_CAST(op)  ((PyCArgObject *)(op))
 
 #define PyCArg_CheckExact(st, v)        Py_IS_TYPE(v, st->PyCArg_Type)
 extern PyCArgObject *PyCArgObject_new(ctypes_state *st);
@@ -550,8 +557,12 @@ PyStgInfo_Init(ctypes_state *state, PyTypeObject *type)
 #  define LOCK_PTR(self) Py_BEGIN_CRITICAL_SECTION(self)
 #  define UNLOCK_PTR(self) Py_END_CRITICAL_SECTION()
 #else
-#  define LOCK_PTR(self)
-#  define UNLOCK_PTR(self)
+/*
+ * Dummy functions instead of macros so that 'self' can be
+ * unused in the caller without triggering a compiler warning.
+ */
+static inline void LOCK_PTR(CDataObject *Py_UNUSED(self)) {}
+static inline void UNLOCK_PTR(CDataObject *Py_UNUSED(self)) {}
 #endif
 
 static inline void