Attachment 14723 Details for Bug 14758 – 0001-libXi-ansification.patch

[patch] 0001-libXi-ansification.patch

0001-libXi-ansification.patch (text/plain), 27.01 KB, created by Paulo César Pereira de Andrade on 2008-02-29 13:46:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-02-29 13:46:50 UTC

Size: 27.01 KB

patch

obsolete

>From 71bc0b383d785ace5be038e1880cac0668dc671a Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Fri, 29 Feb 2008 18:14:00 -0300
>Subject: [PATCH] libXi ansification.
>
>Thre are still two remaining compiler warnings, because of non matching
>function prototypes and function pointer arguments prototypes:
>
>src/XSndExEv.c:XSendExtensionEvent()
>  variable register Status(**fp) (Display *, XEvent*, xEvent **, int *)
>  doesn't match struct _XDisplay's:
>  Status (*wire_vec[128])( /* vector for event to wire */
>                Display *       /* dpy */,
>                XEvent *        /* re */,
>                xEvent *        /* event */
>                );
>
>and
>
>src/XExtInt.c:xinput_extension_hooks field event_to_wire of type
>  XExtensionHooks that has the prototype     Status (*event_to_wire)(
>	      Display*			/* display */,
>              XEvent*			/* re */,
>              xEvent*			/* event */
>  );
>  does not match Status
>  _XiEventToWire(
>    register Display	 *dpy,		/* pointer to display structure */
>    register XEvent	 *re,		/* pointer to client event */
>    register xEvent	**event,	/* wire protocol event */
>    register int	 *count);
>---
> src/XAllowDv.c   |   10 ++--
> src/XChgDCtl.c   |   10 ++--
> src/XChgFCtl.c   |   10 ++--
> src/XChgKMap.c   |   14 +++---
> src/XChgKbd.c    |    6 +-
> src/XChgPnt.c    |   10 ++--
> src/XChgProp.c   |   12 +++---
> src/XCloseDev.c  |    6 +-
> src/XDevBell.c   |   11 +++--
> src/XExtInt.c    |  115 +++++++++++++++++++++++++++++++++++++++---------------
> src/XExtToWire.c |   10 ++--
> src/XFreeLst.c   |    3 +-
> src/XGMotion.c   |   27 +++++--------
> src/XGetBMap.c   |   10 ++--
> src/XGetDCtl.c   |   11 ++---
> src/XGetFCtl.c   |   11 ++---
> src/XGetMMap.c   |    6 +-
> src/XGetProp.c   |    9 ++--
> src/XGrDvBut.c   |   26 ++++++-------
> src/XGrDvKey.c   |   26 ++++++-------
> src/XGrabDev.c   |   21 +++++-----
> src/XGtFocus.c   |   12 +++---
> src/XGtSelect.c  |   15 +++----
> src/XIint.h      |    7 +++
> src/XListDev.c   |    9 ++--
> src/XOpenDev.c   |    6 +-
> src/XQueryDv.c   |    9 ++--
> src/XSelect.c    |   10 ++--
> src/XSetBMap.c   |   10 ++--
> src/XSetDVal.c   |   12 +++---
> src/XSetMMap.c   |    8 ++--
> src/XSetMode.c   |    8 ++--
> src/XSndExEv.c   |   20 ++++-----
> src/XStFocus.c   |   12 +++---
> src/XUngrDev.c   |    8 ++--
> src/XUngrDvB.c   |   14 +++---
> src/XUngrDvK.c   |   14 +++---
> 37 files changed, 288 insertions(+), 250 deletions(-)
>
>diff --git a/src/XAllowDv.c b/src/XAllowDv.c
>index 7fd2a07..bf961ee 100644
>--- a/src/XAllowDv.c
>+++ b/src/XAllowDv.c
>@@ -61,11 +61,11 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XAllowDeviceEvents(dpy, dev, event_mode, time)
>-    register Display *dpy;
>-    XDevice *dev;
>-    int event_mode;
>-    Time time;
>+XAllowDeviceEvents(
>+    register Display	*dpy,
>+    XDevice		 *dev,
>+    int			 event_mode,
>+    Time		 time)
> {
>     xAllowDeviceEventsReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>diff --git a/src/XChgDCtl.c b/src/XChgDCtl.c
>index 952164c..c629c26 100644
>--- a/src/XChgDCtl.c
>+++ b/src/XChgDCtl.c
>@@ -62,11 +62,11 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XChangeDeviceControl(dpy, dev, control, d)
>-    register Display *dpy;
>-    XDevice *dev;
>-    int control;
>-    XDeviceControl *d;
>+XChangeDeviceControl(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    int			 control,
>+    XDeviceControl	*d)
> {
>     int length;
>     xChangeDeviceControlReq *req;
>diff --git a/src/XChgFCtl.c b/src/XChgFCtl.c
>index e499b41..621ca28 100644
>--- a/src/XChgFCtl.c
>+++ b/src/XChgFCtl.c
>@@ -62,11 +62,11 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XChangeFeedbackControl(dpy, dev, mask, f)
>-    register Display *dpy;
>-    XDevice *dev;
>-    unsigned long mask;
>-    XFeedbackControl *f;
>+XChangeFeedbackControl(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    unsigned long	 mask,
>+    XFeedbackControl	*f)
> {
>     int length;
>     xChangeFeedbackControlReq *req;
>diff --git a/src/XChgKMap.c b/src/XChgKMap.c
>index 73de754..9110f8d 100644
>--- a/src/XChgKMap.c
>+++ b/src/XChgKMap.c
>@@ -61,13 +61,13 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XChangeDeviceKeyMapping(dpy, dev, first, syms_per_code, keysyms, count)
>-    register Display *dpy;
>-    XDevice *dev;
>-    int first;
>-    int syms_per_code;
>-    KeySym *keysyms;
>-    int count;
>+XChangeDeviceKeyMapping(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    int			 first,
>+    int			 syms_per_code,
>+    KeySym		*keysyms,
>+    int			 count)
> {
>     register long nbytes;
>     xChangeDeviceKeyMappingReq *req;
>diff --git a/src/XChgKbd.c b/src/XChgKbd.c
>index 1b01207..33a047a 100644
>--- a/src/XChgKbd.c
>+++ b/src/XChgKbd.c
>@@ -61,9 +61,9 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XChangeKeyboardDevice(dpy, dev)
>-    register Display *dpy;
>-    XDevice *dev;
>+XChangeKeyboardDevice(
>+    register Display	*dpy,
>+    XDevice		*dev)
> {
>     xChangeKeyboardDeviceReq *req;
>     xChangeKeyboardDeviceReply rep;
>diff --git a/src/XChgPnt.c b/src/XChgPnt.c
>index 6123398..38d3cb1 100644
>--- a/src/XChgPnt.c
>+++ b/src/XChgPnt.c
>@@ -61,11 +61,11 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XChangePointerDevice(dpy, dev, xaxis, yaxis)
>-    register Display *dpy;
>-    XDevice *dev;
>-    int xaxis;
>-    int yaxis;
>+XChangePointerDevice(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    int			 xaxis,
>+    int			 yaxis)
> {
>     xChangePointerDeviceReq *req;
>     xChangePointerDeviceReply rep;
>diff --git a/src/XChgProp.c b/src/XChgProp.c
>index 0c7377f..c2dce96 100644
>--- a/src/XChgProp.c
>+++ b/src/XChgProp.c
>@@ -62,12 +62,12 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XChangeDeviceDontPropagateList(dpy, window, count, events, mode)
>-    register Display *dpy;
>-    Window window;
>-    int count;
>-    XEventClass *events;
>-    int mode;
>+XChangeDeviceDontPropagateList(
>+    register Display	*dpy,
>+    Window		 window,
>+    int			 count,
>+    XEventClass		*events,
>+    int			 mode)
> {
>     xChangeDeviceDontPropagateListReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>diff --git a/src/XCloseDev.c b/src/XCloseDev.c
>index ca19860..9ab9f65 100644
>--- a/src/XCloseDev.c
>+++ b/src/XCloseDev.c
>@@ -61,9 +61,9 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XCloseDevice(dpy, dev)
>-    register Display *dpy;
>-    register XDevice *dev;
>+XCloseDevice(
>+    register Display	*dpy,
>+    register XDevice	*dev)
> {
>     xCloseDeviceReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>diff --git a/src/XDevBell.c b/src/XDevBell.c
>index 73f2e35..a48def1 100644
>--- a/src/XDevBell.c
>+++ b/src/XDevBell.c
>@@ -61,11 +61,12 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XDeviceBell(dpy, dev, feedbackclass, feedbackid, percent)
>-    register Display *dpy;
>-    XDevice *dev;
>-    XID feedbackclass, feedbackid;
>-    int percent;
>+XDeviceBell(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    XID			 feedbackclass,
>+    XID			 feedbackid,
>+    int			 percent)
> {
>     xDeviceBellReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>diff --git a/src/XExtInt.c b/src/XExtInt.c
>index 10f728d..4164032 100644
>--- a/src/XExtInt.c
>+++ b/src/XExtInt.c
>@@ -66,12 +66,64 @@ SOFTWARE.
> #define ENQUEUE_EVENT	True
> #define DONT_ENQUEUE	False
> 
>+extern void _xibaddevice(
>+    Display *		/* dpy */,
>+    int *		/* error */
>+);
>+
>+extern void _xibadclass(
>+    Display *		/* dpy */,
>+    int *		/* error */
>+);
>+
>+extern void _xibadevent(
>+    Display *		/* dpy */,
>+    int *		/* error */
>+);
>+
>+extern void _xibadmode(
>+    Display *		/* dpy */,
>+    int *		/* error */
>+);
>+
>+extern void _xidevicebusy(
>+    Display *		/* dpy */,
>+    int *		/* error */
>+);
>+
>+extern int _XiGetDevicePresenceNotifyEvent(
>+    Display *		/* dpy */
>+);
>+
> static XExtensionInfo *xinput_info;
> static /* const */ char *xinput_extension_name = INAME;
>-static int XInputClose();
>-static char *XInputError();
>-static Bool XInputWireToEvent();
>-Status _XiEventToWire();
>+
>+static int XInputClose(
>+    Display *		/* dpy */,
>+    XExtCodes *		/* codes */
>+);
>+
>+static char *XInputError(
>+    Display *		/* dpy */,
>+    int			/* code */,
>+    XExtCodes *		/* codes */,
>+    char *		/* buf */,
>+    int			/* n */
>+);
>+
>+static Bool XInputWireToEvent(
>+    Display *		/* dpy */,
>+    XEvent *		/* re */,
>+    xEvent *		/* event */
>+);
>+
>+Status _XiEventToWire(
>+    register Display *	/* dpy */,
>+    register XEvent *	/* re */,
>+    register xEvent **	/* event */,
>+    register int *	/* count */
>+);
>+
> static /* const */ XEvent emptyevent;
> 
> typedef struct _XInputData
>@@ -131,9 +183,9 @@ XEXT_GENERATE_FIND_DISPLAY(XInput_find_display, xinput_info,
>  */
> 
> void
>-_xibaddevice(dpy, error)
>-    Display *dpy;
>-    int *error;
>+_xibaddevice(
>+    Display	*dpy,
>+    int		*error)
> {
>     XExtDisplayInfo *info = XInput_find_display(dpy);
> 
>@@ -141,9 +193,9 @@ _xibaddevice(dpy, error)
> }
> 
> void
>-_xibadclass(dpy, error)
>-    Display *dpy;
>-    int *error;
>+_xibadclass(
>+    Display	*dpy,
>+    int		*error)
> {
>     XExtDisplayInfo *info = XInput_find_display(dpy);
> 
>@@ -151,9 +203,9 @@ _xibadclass(dpy, error)
> }
> 
> void
>-_xibadevent(dpy, error)
>-    Display *dpy;
>-    int *error;
>+_xibadevent(
>+    Display	*dpy,
>+    int		*error)
> {
>     XExtDisplayInfo *info = XInput_find_display(dpy);
> 
>@@ -161,9 +213,9 @@ _xibadevent(dpy, error)
> }
> 
> void
>-_xibadmode(dpy, error)
>-    Display *dpy;
>-    int *error;
>+_xibadmode(
>+    Display	*dpy,
>+    int		*error)
> {
>     XExtDisplayInfo *info = XInput_find_display(dpy);
> 
>@@ -171,9 +223,9 @@ _xibadmode(dpy, error)
> }
> 
> void
>-_xidevicebusy(dpy, error)
>-    Display *dpy;
>-    int *error;
>+_xidevicebusy(
>+    Display	*dpy,
>+    int		*error)
> {
>     XExtDisplayInfo *info = XInput_find_display(dpy);
> 
>@@ -194,10 +246,10 @@ static int XInputCheckExtension(Display *dpy, XExtDisplayInfo *info)
>  */
> 
> int
>-_XiCheckExtInit(dpy, version_index, info)
>-    register Display *dpy;
>-    register int version_index;
>-    XExtDisplayInfo *info;
>+_XiCheckExtInit(
>+    register Display	*dpy,
>+    register int	 version_index,
>+    XExtDisplayInfo	*info)
> {
>     XExtensionVersion *ext;
> 
>@@ -235,9 +287,9 @@ _XiCheckExtInit(dpy, version_index, info)
>  */
> 
> static int
>-XInputClose(dpy, codes)
>-    Display *dpy;
>-    XExtCodes *codes;
>+XInputClose(
>+    Display	*dpy,
>+    XExtCodes	*codes)
> {
>     XExtDisplayInfo *info = XInput_find_display(dpy);
> 
>@@ -249,8 +301,7 @@ XInputClose(dpy, codes)
> }
> 
> static int
>-Ones(mask)
>-    Mask mask;
>+Ones(Mask mask)
> {
>     register Mask y;
> 
>@@ -275,10 +326,10 @@ _XiGetDevicePresenceNotifyEvent(Display * dpy)
>  */
> 
> static Bool
>-XInputWireToEvent(dpy, re, event)
>-    Display *dpy;
>-    XEvent *re;
>-    xEvent *event;
>+XInputWireToEvent(
>+    Display	*dpy,
>+    XEvent	*re,
>+    xEvent	*event)
> {
>     unsigned int type, reltype;
>     unsigned int i, j;
>diff --git a/src/XExtToWire.c b/src/XExtToWire.c
>index 213da32..a840d7e 100644
>--- a/src/XExtToWire.c
>+++ b/src/XExtToWire.c
>@@ -62,11 +62,11 @@ SOFTWARE.
> #include "XIint.h"
> 
> Status
>-_XiEventToWire(dpy, re, event, count)
>-    register Display *dpy;	/* pointer to display structure */
>-    register XEvent *re;	/* pointer to client event */
>-    register xEvent **event;	/* wire protocol event */
>-    register int *count;
>+_XiEventToWire(
>+    register Display	 *dpy,		/* pointer to display structure */
>+    register XEvent	 *re,		/* pointer to client event */
>+    register xEvent	**event,	/* wire protocol event */
>+    register int	 *count)
> {
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>     int i;
>diff --git a/src/XFreeLst.c b/src/XFreeLst.c
>index 1805c30..fa3fe18 100644
>--- a/src/XFreeLst.c
>+++ b/src/XFreeLst.c
>@@ -62,8 +62,7 @@ SOFTWARE.
>  *
>  */
> 
>-XFreeDeviceList(list)
>-    XDeviceList *list;
>+XFreeDeviceList(XDeviceList *list)
> {
>     if (list != NULL) {
> 	XFree((list->name) - sizeof(XDeviceList));
>diff --git a/src/XGMotion.c b/src/XGMotion.c
>index cd361dd..4353a27 100644
>--- a/src/XGMotion.c
>+++ b/src/XGMotion.c
>@@ -60,21 +60,15 @@ SOFTWARE.
> #include <X11/extensions/extutil.h>
> #include "XIint.h"
> 
>-XDeviceTimeCoord
>-    * XGetDeviceMotionEvents(dpy, dev, start, stop, nEvents, mode, axis_count)
>-    register Display *
>-	dpy;
>-    XDevice *
>-	dev;
>-
>-Time start;
>-Time stop;
>-    int *
>-	nEvents;
>-    int *
>-	mode;
>-    int *
>-	axis_count;
>+XDeviceTimeCoord *
>+XGetDeviceMotionEvents(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    Time		 start,
>+    Time		 stop,
>+    int			*nEvents,
>+    int			*mode,
>+    int			*axis_count)
> {
>     xGetDeviceMotionEventsReq *req;
>     xGetDeviceMotionEventsReply rep;
>@@ -140,8 +134,7 @@ Time stop;
> }
> 
> void
>-XFreeDeviceMotionEvents(events)
>-    XDeviceTimeCoord *events;
>+XFreeDeviceMotionEvents(XDeviceTimeCoord *events)
> {
>     XFree((char *)events);
> }
>diff --git a/src/XGetBMap.c b/src/XGetBMap.c
>index 15cad74..6b612be 100644
>--- a/src/XGetBMap.c
>+++ b/src/XGetBMap.c
>@@ -66,11 +66,11 @@ SOFTWARE.
> #define MIN(a, b) ((a) < (b) ? (a) : (b))
> 
> int
>-XGetDeviceButtonMapping(dpy, device, map, nmap)
>-    register Display *dpy;
>-    XDevice *device;
>-    unsigned char map[];
>-    unsigned int nmap;
>+XGetDeviceButtonMapping(
>+    register Display	*dpy,
>+    XDevice		*device,
>+    unsigned char	 map[],
>+    unsigned int	 nmap)
> {
>     int status = 0;
>     unsigned char mapping[256];	/* known fixed size */
>diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
>index 7689059..cc313a1 100644
>--- a/src/XGetDCtl.c
>+++ b/src/XGetDCtl.c
>@@ -62,10 +62,10 @@ SOFTWARE.
> #include "XIint.h"
> 
> XDeviceControl *
>-XGetDeviceControl(dpy, dev, control)
>-    register Display *dpy;
>-    XDevice *dev;
>-    int control;
>+XGetDeviceControl(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    int			 control)
> {
>     int size = 0;
>     int nbytes, i;
>@@ -239,8 +239,7 @@ XGetDeviceControl(dpy, dev, control)
> }
> 
> void
>-XFreeDeviceControl(control)
>-    XDeviceControl *control;
>+XFreeDeviceControl(XDeviceControl *control)
> {
>     XFree(control);
> }
>diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c
>index af4578c..1db5b36 100644
>--- a/src/XGetFCtl.c
>+++ b/src/XGetFCtl.c
>@@ -62,10 +62,10 @@ SOFTWARE.
> #include "XIint.h"
> 
> XFeedbackState *
>-XGetFeedbackControl(dpy, dev, num_feedbacks)
>-    register Display *dpy;
>-    XDevice *dev;
>-    int *num_feedbacks;
>+XGetFeedbackControl(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    int			*num_feedbacks)
> {
>     int size = 0;
>     int nbytes, i;
>@@ -265,8 +265,7 @@ XGetFeedbackControl(dpy, dev, num_feedbacks)
> }
> 
> void
>-XFreeFeedbackList(list)
>-    XFeedbackState *list;
>+XFreeFeedbackList(XFeedbackState *list)
> {
>     XFree((char *)list);
> }
>diff --git a/src/XGetMMap.c b/src/XGetMMap.c
>index ef92281..25d4e75 100644
>--- a/src/XGetMMap.c
>+++ b/src/XGetMMap.c
>@@ -61,9 +61,9 @@ SOFTWARE.
> #include "XIint.h"
> 
> XModifierKeymap *
>-XGetDeviceModifierMapping(dpy, dev)
>-    register Display *dpy;
>-    XDevice *dev;
>+XGetDeviceModifierMapping(
>+    register Display	*dpy,
>+    XDevice		*dev)
> {
>     unsigned long nbytes;
>     XModifierKeymap *res;
>diff --git a/src/XGetProp.c b/src/XGetProp.c
>index 71d844b..7887257 100644
>--- a/src/XGetProp.c
>+++ b/src/XGetProp.c
>@@ -62,11 +62,10 @@ SOFTWARE.
> #include "XIint.h"
> 
> XEventClass *
>-XGetDeviceDontPropagateList(dpy, window, count)
>-    register Display *dpy;
>-
>-Window window;
>-    int *count;
>+XGetDeviceDontPropagateList(
>+    register Display	*dpy,
>+    Window		 window,
>+    int			*count)
> {
>     XEventClass *list = NULL;
>     int rlen;
>diff --git a/src/XGrDvBut.c b/src/XGrDvBut.c
>index 6e35099..d64d218 100644
>--- a/src/XGrDvBut.c
>+++ b/src/XGrDvBut.c
>@@ -61,20 +61,18 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XGrabDeviceButton(dpy, dev, button, modifiers, modifier_device,
>-		  grab_window, owner_events, event_count, event_list,
>-		  this_device_mode, other_devices_mode)
>-    register Display *dpy;
>-    XDevice *dev;
>-    unsigned int button;	/* CARD8 */
>-    unsigned int modifiers;	/* CARD16 */
>-    XDevice *modifier_device;
>-    Window grab_window;
>-    Bool owner_events;
>-    unsigned int event_count;
>-    XEventClass *event_list;
>-    int this_device_mode;
>-    int other_devices_mode;
>+XGrabDeviceButton(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    unsigned int	 button,	/* CARD8 */
>+    unsigned int	 modifiers,	/* CARD16 */
>+    XDevice		*modifier_device,
>+    Window		 grab_window,
>+    Bool		 owner_events,
>+    unsigned int	 event_count,
>+    XEventClass		*event_list,
>+    int			 this_device_mode,
>+    int			 other_devices_mode)
> {
>     register xGrabDeviceButtonReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>diff --git a/src/XGrDvKey.c b/src/XGrDvKey.c
>index 1389753..78e41a7 100644
>--- a/src/XGrDvKey.c
>+++ b/src/XGrDvKey.c
>@@ -61,20 +61,18 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XGrabDeviceKey(dpy, dev, key, modifiers, modifier_device,
>-	       grab_window, owner_events, event_count, event_list,
>-	       this_device_mode, other_devices_mode)
>-    register Display *dpy;
>-    XDevice *dev;
>-    unsigned int key;	/* CARD8 */
>-    unsigned int modifiers;	/* CARD16 */
>-    XDevice *modifier_device;
>-    Window grab_window;
>-    Bool owner_events;
>-    unsigned int event_count;
>-    XEventClass *event_list;
>-    int this_device_mode;
>-    int other_devices_mode;
>+XGrabDeviceKey(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    unsigned int	 key,		/* CARD8 */
>+    unsigned int	 modifiers,	/* CARD16 */
>+    XDevice		*modifier_device,
>+    Window		 grab_window,
>+    Bool		 owner_events,
>+    unsigned int	 event_count,
>+    XEventClass		*event_list,
>+    int			 this_device_mode,
>+    int			 other_devices_mode)
> {
>     register xGrabDeviceKeyReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>diff --git a/src/XGrabDev.c b/src/XGrabDev.c
>index 92f1c11..cb2f7d7 100644
>--- a/src/XGrabDev.c
>+++ b/src/XGrabDev.c
>@@ -61,17 +61,16 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XGrabDevice(dpy, dev, grab_window, ownerEvents, event_count, event_list,
>-	    this_device_mode, other_devices_mode, time)
>-    register Display *dpy;
>-    XDevice *dev;
>-    Window grab_window;
>-    Bool ownerEvents;
>-    int event_count;
>-    XEventClass *event_list;
>-    int this_device_mode;
>-    int other_devices_mode;
>-    Time time;
>+XGrabDevice(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    Window		 grab_window,
>+    Bool		 ownerEvents,
>+    int			 event_count,
>+    XEventClass		*event_list,
>+    int			 this_device_mode,
>+    int			 other_devices_mode,
>+    Time		 time)
> {
>     xGrabDeviceReply rep;
>     register xGrabDeviceReq *req;
>diff --git a/src/XGtFocus.c b/src/XGtFocus.c
>index 4e63918..6f91a14 100644
>--- a/src/XGtFocus.c
>+++ b/src/XGtFocus.c
>@@ -61,12 +61,12 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XGetDeviceFocus(dpy, dev, focus, revert_to, time)
>-    register Display *dpy;
>-    XDevice *dev;
>-    Window *focus;
>-    int *revert_to;
>-    Time *time;
>+XGetDeviceFocus(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    Window		*focus,
>+    int			*revert_to,
>+    Time		*time)
> {
>     xGetDeviceFocusReq *req;
>     xGetDeviceFocusReply rep;
>diff --git a/src/XGtSelect.c b/src/XGtSelect.c
>index 95d3c87..031b9f7 100644
>--- a/src/XGtSelect.c
>+++ b/src/XGtSelect.c
>@@ -61,14 +61,13 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XGetSelectedExtensionEvents(dpy, w, this_client_count, this_client_list,
>-			    all_clients_count, all_clients_list)
>-    register Display *dpy;
>-    Window w;
>-    int *this_client_count;
>-    XEventClass **this_client_list;
>-    int *all_clients_count;
>-    XEventClass **all_clients_list;
>+XGetSelectedExtensionEvents(
>+    register Display	 *dpy,
>+    Window		  w,
>+    int			 *this_client_count,
>+    XEventClass		**this_client_list,
>+    int			 *all_clients_count,
>+    XEventClass		**all_clients_list)
> {
>     int tlen, alen;
>     register xGetSelectedExtensionEventsReq *req;
>diff --git a/src/XIint.h b/src/XIint.h
>index f35619c..f52eda7 100644
>--- a/src/XIint.h
>+++ b/src/XIint.h
>@@ -14,4 +14,11 @@ extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *);
> 
> extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *);
> 
>+extern Status _XiEventToWire(
>+    register Display *		/* dpy */,
>+    register XEvent *		/* re */,
>+    register xEvent **		/* event */,
>+    register int *		/* count */
>+);
>+
> #endif
>diff --git a/src/XListDev.c b/src/XListDev.c
>index b9a617d..e98adaa 100644
>--- a/src/XListDev.c
>+++ b/src/XListDev.c
>@@ -64,9 +64,9 @@ SOFTWARE.
> #include "XIint.h"
> 
> XDeviceInfo *
>-XListInputDevices(dpy, ndevices)
>-    register Display *dpy;
>-    int *ndevices;
>+XListInputDevices(
>+    register Display	*dpy,
>+    int			*ndevices)
> {
>     int size;
>     xListInputDevicesReq *req;
>@@ -238,8 +238,7 @@ XListInputDevices(dpy, ndevices)
>  */
> 
> void
>-XFreeDeviceList(list)
>-    XDeviceInfo *list;
>+XFreeDeviceList(XDeviceInfo *list)
> {
>     if (list != NULL) {
> 	XFree((char *)list);
>diff --git a/src/XOpenDev.c b/src/XOpenDev.c
>index d220330..4b0b44d 100644
>--- a/src/XOpenDev.c
>+++ b/src/XOpenDev.c
>@@ -61,9 +61,9 @@ SOFTWARE.
> #include "XIint.h"
> 
> XDevice *
>-XOpenDevice(dpy, id)
>-    register Display *dpy;
>-    register XID id;
>+XOpenDevice(
>+    register Display	*dpy,
>+    register XID	 id)
> {
>     register long rlen;	/* raw length */
>     xOpenDeviceReq *req;
>diff --git a/src/XQueryDv.c b/src/XQueryDv.c
>index 540f224..9afe482 100644
>--- a/src/XQueryDv.c
>+++ b/src/XQueryDv.c
>@@ -61,9 +61,9 @@ SOFTWARE.
> #include "XIint.h"
> 
> XDeviceState *
>-XQueryDeviceState(dpy, dev)
>-    register Display *dpy;
>-    XDevice *dev;
>+XQueryDeviceState(
>+    register Display	*dpy,
>+    XDevice		*dev)
> {
>     int i, j;
>     int rlen;
>@@ -186,8 +186,7 @@ XQueryDeviceState(dpy, dev)
> }
> 
> void
>-XFreeDeviceState(list)
>-    XDeviceState *list;
>+XFreeDeviceState(XDeviceState *list)
> {
>     XFree((char *)list);
> }
>diff --git a/src/XSelect.c b/src/XSelect.c
>index af0fb84..80d8dd4 100644
>--- a/src/XSelect.c
>+++ b/src/XSelect.c
>@@ -61,11 +61,11 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XSelectExtensionEvent(dpy, w, event_list, count)
>-    register Display *dpy;
>-    Window w;
>-    XEventClass *event_list;
>-    int count;
>+XSelectExtensionEvent(
>+    register Display	*dpy,
>+    Window		 w,
>+    XEventClass		*event_list,
>+    int			 count)
> {
>     register xSelectExtensionEventReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>diff --git a/src/XSetBMap.c b/src/XSetBMap.c
>index cad6976..253fdac 100644
>--- a/src/XSetBMap.c
>+++ b/src/XSetBMap.c
>@@ -64,11 +64,11 @@ SOFTWARE.
> /* returns either  DeviceMappingSuccess or DeviceMappingBusy  */
> 
> int
>-XSetDeviceButtonMapping(dpy, device, map, nmap)
>-    register Display *dpy;
>-    XDevice *device;
>-    unsigned char map[];
>-    int nmap;
>+XSetDeviceButtonMapping(
>+    register Display	*dpy,
>+    XDevice		*device,
>+    unsigned char	 map[],
>+    int			 nmap)
> {
>     register xSetDeviceButtonMappingReq *req;
>     xSetDeviceButtonMappingReply rep;
>diff --git a/src/XSetDVal.c b/src/XSetDVal.c
>index 43702b0..8b5a1c6 100644
>--- a/src/XSetDVal.c
>+++ b/src/XSetDVal.c
>@@ -62,12 +62,12 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XSetDeviceValuators(dpy, dev, valuators, first_valuator, num_valuators)
>-    register Display *dpy;
>-    XDevice *dev;
>-    int *valuators;
>-    int first_valuator;
>-    int num_valuators;
>+XSetDeviceValuators(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    int			*valuators,
>+    int			 first_valuator,
>+    int			 num_valuators)
> {
>     xSetDeviceValuatorsReq *req;
>     xSetDeviceValuatorsReply rep;
>diff --git a/src/XSetMMap.c b/src/XSetMMap.c
>index 1077433..840add7 100644
>--- a/src/XSetMMap.c
>+++ b/src/XSetMMap.c
>@@ -61,10 +61,10 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XSetDeviceModifierMapping(dpy, dev, modmap)
>-    register Display *dpy;
>-    XDevice *dev;
>-    XModifierKeymap *modmap;
>+XSetDeviceModifierMapping(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    XModifierKeymap	*modmap)
> {
>     int mapSize = modmap->max_keypermod << 3;	/* 8 modifiers */
>     xSetDeviceModifierMappingReq *req;
>diff --git a/src/XSetMode.c b/src/XSetMode.c
>index 94e2b3d..88724d6 100644
>--- a/src/XSetMode.c
>+++ b/src/XSetMode.c
>@@ -61,10 +61,10 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XSetDeviceMode(dpy, dev, mode)
>-    register Display *dpy;
>-    XDevice *dev;
>-    int mode;
>+XSetDeviceMode(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    int			 mode)
> {
>     xSetDeviceModeReq *req;
>     xSetDeviceModeReply rep;
>diff --git a/src/XSndExEv.c b/src/XSndExEv.c
>index 71431cd..3ec1f7e 100644
>--- a/src/XSndExEv.c
>+++ b/src/XSndExEv.c
>@@ -60,23 +60,21 @@ SOFTWARE.
> #include <X11/extensions/extutil.h>
> #include "XIint.h"
> 
>-extern Status _XiEventToWire();
>-
> Status
>-XSendExtensionEvent(dpy, dev, dest, prop, count, list, event)
>-    register Display *dpy;
>-    XDevice *dev;
>-    Window dest;
>-    Bool prop;
>-    int count;
>-    XEventClass *list;
>-    XEvent *event;
>+XSendExtensionEvent(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    Window		 dest,
>+    Bool		 prop,
>+    int			 count,
>+    XEventClass		*list,
>+    XEvent		*event)
> {
>     int num_events;
>     int ev_size;
>     xSendExtensionEventReq *req;
>     xEvent *ev;
>-    register Status(**fp) ();
>+    register Status(**fp) (Display *, XEvent*, xEvent **, int *);
>     Status status;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
> 
>diff --git a/src/XStFocus.c b/src/XStFocus.c
>index e544126..5bbb9b4 100644
>--- a/src/XStFocus.c
>+++ b/src/XStFocus.c
>@@ -61,12 +61,12 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XSetDeviceFocus(dpy, dev, focus, revert_to, time)
>-    register Display *dpy;
>-    XDevice *dev;
>-    Window focus;
>-    int revert_to;
>-    Time time;
>+XSetDeviceFocus(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    Window		 focus,
>+    int			 revert_to,
>+    Time		 time)
> {
>     xSetDeviceFocusReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>diff --git a/src/XUngrDev.c b/src/XUngrDev.c
>index 70ba03d..9447f59 100644
>--- a/src/XUngrDev.c
>+++ b/src/XUngrDev.c
>@@ -61,10 +61,10 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XUngrabDevice(dpy, dev, time)
>-    register Display *dpy;
>-    XDevice *dev;
>-    Time time;
>+XUngrabDevice(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    Time		 time)
> {
>     register xUngrabDeviceReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>diff --git a/src/XUngrDvB.c b/src/XUngrDvB.c
>index 77dbe77..ae46b95 100644
>--- a/src/XUngrDvB.c
>+++ b/src/XUngrDvB.c
>@@ -61,13 +61,13 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XUngrabDeviceButton(dpy, dev, button, modifiers, modifier_dev, grab_window)
>-    register Display *dpy;
>-    XDevice *dev;
>-    unsigned int button;	/* CARD8 */
>-    unsigned int modifiers;	/* CARD16 */
>-    XDevice *modifier_dev;
>-    Window grab_window;
>+XUngrabDeviceButton(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    unsigned int	 button,	/* CARD8 */
>+    unsigned int	 modifiers,	/* CARD16 */
>+    XDevice		*modifier_dev,
>+    Window		 grab_window)
> {
>     register xUngrabDeviceButtonReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>diff --git a/src/XUngrDvK.c b/src/XUngrDvK.c
>index 0ae3178..9142ff2 100644
>--- a/src/XUngrDvK.c
>+++ b/src/XUngrDvK.c
>@@ -61,13 +61,13 @@ SOFTWARE.
> #include "XIint.h"
> 
> int
>-XUngrabDeviceKey(dpy, dev, key, modifiers, modifier_dev, grab_window)
>-    register Display *dpy;
>-    XDevice *dev;
>-    unsigned int key;	/* CARD8 */
>-    unsigned int modifiers;	/* CARD16 */
>-    XDevice *modifier_dev;
>-    Window grab_window;
>+XUngrabDeviceKey(
>+    register Display	*dpy,
>+    XDevice		*dev,
>+    unsigned int	 key,		/* CARD8 */
>+    unsigned int	 modifiers,	/* CARD16 */
>+    XDevice		*modifier_dev,
>+    Window		 grab_window)
> {
>     register xUngrabDeviceKeyReq *req;
>     XExtDisplayInfo *info = XInput_find_display(dpy);
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 14758: 14723

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.