[PATCH joystick 5/9] Drop close_proc, conversion_proc, reverse_conversion_proc

Peter Hutterer peter.hutterer at who-t.net
Wed Dec 15 18:44:49 PST 2010

On Wed, Dec 15, 2010 at 08:36:01AM -0500, Trevor Woerner wrote:
> Just out of curiosity...
> After applying this patch...
> 1)
> In src/jstk.c, line 490, jstkCorePreInit() the code is setting
> priv->close_proc to NULL.
> At line 423, jstkDeviceControlProc(), the code is calling
> priv->close_proc() but first checks to make sure it isn't NULL, at
> line 311 it is also calling priv->close_proc() but without the check.
> Could this potentially be a problem?

possibly. note that the driver has two close_procs() for some reason, the
one in pInfo (this one was removed from the server with ABI12) and the
driver-internal priv->close_proc(). this latter one is unaffected and
I didn't try to fix the driver itself, so I left the non-ABI related code
as-is. feel free to send a patch in to fix this.

> 2)
> This patch removes the lines:
> pInfo->close_proc = NULL;
> pInfo->conversion_proc = NULL;
> from src/jstk.c but doesn't do the same for src/jstk_key.c. Is that
> okay? (I don't think InputInfoPtr contains those fields). I did notice
> they are removed with patch #9.

whoops, sloppy. amended and rebased.


More information about the xorg-devel mailing list