Use casts and make slot function signatures correct

Author: emmatyping

Modules/_zstd/compressor.c

@@ -23,6 +23,8 @@ class _zstd.ZstdCompressor "ZstdCompressor *" "clinic_state()->ZstdCompressor_ty
 #include <stddef.h>               // offsetof()
 
 
+#define ZstdCompressor_CAST(op) ((ZstdCompressor *)op)
+
 int
 _PyZstd_set_c_parameters(ZstdCompressor *self, PyObject *level_or_options,
                          const char *arg_name, const char* arg_type)
@@ -321,8 +323,9 @@ _zstd_ZstdCompressor_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject
 }
 
 static void
-ZstdCompressor_dealloc(ZstdCompressor *self)
+ZstdCompressor_dealloc(PyObject *ob)
 {
+    ZstdCompressor *self = ZstdCompressor_CAST(ob);
     /* Free compression context */
     ZSTD_freeCCtx(self->cctx);
 

Modules/_zstd/decompressor.c

@@ -21,6 +21,8 @@ class _zstd.ZstdDecompressor "ZstdDecompressor *" "clinic_state()->ZstdDecompres
 
 #include <stddef.h>               // offsetof()
 
+#define ZstdDecompressor_CAST(op) ((ZstdDecompressor *)op)
+
 static inline ZSTD_DDict *
 _get_DDict(ZstdDict *self)
 {
@@ -630,8 +632,9 @@ _zstd_ZstdDecompressor_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 }
 
 static void
-ZstdDecompressor_dealloc(ZstdDecompressor *self)
+ZstdDecompressor_dealloc(PyObject *ob)
 {
+    ZstdDecompressor *self = ZstdDecompressor_CAST(ob);
     /* Free decompression context */
     ZSTD_freeDCtx(self->dctx);
 

Modules/_zstd/zdict.c

@@ -19,6 +19,7 @@ class _zstd.ZstdDict "ZstdDict *" "clinic_state()->ZstdDict_type"
 
 #include <stddef.h>               // offsetof()
 
+#define ZstdDict_CAST(op) ((ZstdDict *)op)
 
 static PyObject *
 _zstd_ZstdDict_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject *Py_UNUSED(kwargs))
@@ -48,8 +49,9 @@ _zstd_ZstdDict_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject *Py_U
 }
 
 static void
-ZstdDict_dealloc(ZstdDict *self)
+ZstdDict_dealloc(PyObject *ob)
 {
+    ZstdDict *self = ZstdDict_CAST(ob);
     /* Free ZSTD_CDict instances */
     Py_XDECREF(self->c_dicts);
 
@@ -145,8 +147,9 @@ PyDoc_STRVAR(ZstdDict_dictcontent_doc,
 "argument in ZstdDict.__init__() method. It can be used with other programs.");
 
 static PyObject *
-ZstdDict_str(ZstdDict *dict)
+ZstdDict_str(PyObject *ob)
 {
+    ZstdDict *dict = ZstdDict_CAST(ob);
     return PyUnicode_FromFormat("<ZstdDict dict_id=%u dict_size=%zd>",
                                 dict->dict_id, Py_SIZE(dict->dict_content));
 }
@@ -233,8 +236,9 @@ static PyGetSetDef ZstdDict_getset[] = {
 };
 
 static Py_ssize_t
-ZstdDict_length(ZstdDict *self)
+ZstdDict_length(PyObject *ob)
 {
+    ZstdDict *self = ZstdDict_CAST(ob);
     assert(PyBytes_Check(self->dict_content));
     return Py_SIZE(self->dict_content);
 }