I also removed all of the (getter) casts, but I'm not sure if that will work correctly since strictly speaking most of the function pointers are defined with type e.g.,

PyObject *
get_some_attr(SpecificTypeOfObject *decoder, void *closure)

whereas the first argument is expected to be a PyObject *. So depending on what error / warning flags are set, this may generate a bunch of warnings or a compile error.

Probably it's better to put the casts back, but it's unfortunate that we can't get better type safety here -- it's so easy to mess up these signatures.

It is indeed generating a bunch of warnings - https://github.com/python-pillow/Pillow/runs/4202395176#step:9:26

src/_imaging.c:3571:14: warning: initialization of ‘PyObject * (*)(PyObject *, void )’ {aka ‘struct _object * ()(struct _object *, void )’} from incompatible pointer type ‘PyObject * ()(ImagingObject *, void )’ {aka ‘struct _object * ()(struct *, void *)’} [-Wincompatible-pointer-types]
3571 | {"mode", _getattr_mode},
| ^~~~~~~~~~~~~
src/_imaging.c:3571:14: note: (near initialization for ‘getsetters[0].get’)

Okay I put the casts back.

Please could you rebase or redo those two commits, to clean the history up a little bit?

One way:

git reset --soft HEAD~2
git push --force

Thanks!