ANSIfy Xi/. Mostly automated via protoize(1).

38 files changed, 320 insertions, 690 deletions

diff --git a/Xi/allowev.c b/Xi/allowev.c
index c1df7eb73..83c664758 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -79,9 +79,8 @@ SOFTWARE.
  */
 
 int
-SProcXAllowDeviceEvents(client)
-    register ClientPtr client;
-    {
+SProcXAllowDeviceEvents(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xAllowDeviceEventsReq);
@@ -98,9 +97,8 @@ SProcXAllowDeviceEvents(client)
  */
 
 int
-ProcXAllowDeviceEvents(client)
-    register ClientPtr client;
-    {
+ProcXAllowDeviceEvents(register ClientPtr client)
+{
     TimeStamp		time;
     DeviceIntPtr	thisdev;
 
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index 63a3c9c69..004000360 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -80,9 +80,8 @@ SOFTWARE.
  */
 
 int
-SProcXChangeDeviceControl(client)
-    register ClientPtr client;
-    {
+SProcXChangeDeviceControl(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xChangeDeviceControlReq);
@@ -99,9 +98,8 @@ SProcXChangeDeviceControl(client)
  */
 
 int
-ProcXChangeDeviceControl(client)
-    ClientPtr client;
-    {
+ProcXChangeDeviceControl(ClientPtr client)
+{
     unsigned len;
     int i, status;
     DeviceIntPtr dev;
@@ -205,11 +203,8 @@ ProcXChangeDeviceControl(client)
  */
 
 void
-SRepXChangeDeviceControl (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xChangeDeviceControlReply	*rep;
-    {
+SRepXChangeDeviceControl (ClientPtr client, int size, xChangeDeviceControlReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index c502db325..09741507d 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -81,9 +81,8 @@ SOFTWARE.
  */
 
 int
-SProcXChangeFeedbackControl(client)
-    register ClientPtr client;
-    {
+SProcXChangeFeedbackControl(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xChangeFeedbackControlReq);
@@ -100,9 +99,8 @@ SProcXChangeFeedbackControl(client)
  */
 
 int
-ProcXChangeFeedbackControl(client)
-    ClientPtr client;
-    {
+ProcXChangeFeedbackControl(ClientPtr client)
+{
     unsigned len;
     DeviceIntPtr dev;
     KbdFeedbackPtr k;
@@ -233,13 +231,8 @@ ProcXChangeFeedbackControl(client)
  */
 
 int
-ChangeKbdFeedback (client, dev, mask, k, f)
-    ClientPtr client;
-    DeviceIntPtr dev;
-    unsigned long 	mask;
-    KbdFeedbackPtr	k;
-    xKbdFeedbackCtl 	*f;
-    {
+ChangeKbdFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, KbdFeedbackPtr k, xKbdFeedbackCtl *f)
+{
     register char n;
     KeybdCtrl kctrl;
     int t;
@@ -389,13 +382,8 @@ ChangeKbdFeedback (client, dev, mask, k, f)
  */
 
 int
-ChangePtrFeedback (client, dev, mask, p, f)
-    ClientPtr 		client;
-    DeviceIntPtr 	dev;
-    unsigned long 	mask;
-    PtrFeedbackPtr 	p;
-    xPtrFeedbackCtl 	*f;
-    {
+ChangePtrFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, PtrFeedbackPtr p, xPtrFeedbackCtl *f)
+{
     register char n;
     PtrCtrl pctrl;		/* might get BadValue part way through */
 
@@ -471,13 +459,8 @@ ChangePtrFeedback (client, dev, mask, p, f)
  */
 
 int
-ChangeIntegerFeedback (client, dev, mask, i, f)
-    ClientPtr 			client;
-    DeviceIntPtr 		dev;
-    unsigned long 		mask;
-    IntegerFeedbackPtr 		i;
-    xIntegerFeedbackCtl 	*f;
-    {
+ChangeIntegerFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, IntegerFeedbackPtr i, xIntegerFeedbackCtl *f)
+{
     register char n;
 
     if (client->swapped)
@@ -498,13 +481,8 @@ ChangeIntegerFeedback (client, dev, mask, i, f)
  */
 
 int
-ChangeStringFeedback (client, dev, mask, s, f)
-    ClientPtr 		client;
-    DeviceIntPtr 	dev;
-    unsigned long 	mask;
-    StringFeedbackPtr 	s;
-    xStringFeedbackCtl 	*f;
-    {
+ChangeStringFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, StringFeedbackPtr s, xStringFeedbackCtl *f)
+{
     register char n;
     register long *p;
     int		i, j;
@@ -556,13 +534,8 @@ ChangeStringFeedback (client, dev, mask, s, f)
  */
 
 int
-ChangeBellFeedback (client, dev, mask, b, f)
-    ClientPtr 		client;
-    DeviceIntPtr 	dev;
-    unsigned long 	mask;
-    BellFeedbackPtr 	b;
-    xBellFeedbackCtl 	*f;
-    {
+ChangeBellFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, BellFeedbackPtr b, xBellFeedbackCtl *f)
+{
     register char n;
     int t;
     BellCtrl bctrl;		/* might get BadValue part way through */
@@ -631,13 +604,8 @@ ChangeBellFeedback (client, dev, mask, b, f)
  */
 
 int
-ChangeLedFeedback (client, dev, mask, l, f)
-    ClientPtr 		client;
-    DeviceIntPtr 	dev;
-    unsigned long 	mask;
-    LedFeedbackPtr 	l;
-    xLedFeedbackCtl 	*f;
-    {
+ChangeLedFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, LedFeedbackPtr l, xLedFeedbackCtl *f)
+{
     register char n;
     LedCtrl lctrl;		/* might get BadValue part way through */
 
diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c
index a8a6024d8..6f3c63521 100644
--- a/Xi/chgkbd.c
+++ b/Xi/chgkbd.c
@@ -82,9 +82,8 @@ SOFTWARE.
  */
 
 int
-SProcXChangeKeyboardDevice(client)
-    register ClientPtr client;
-    {
+SProcXChangeKeyboardDevice(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xChangeKeyboardDeviceReq);
@@ -101,9 +100,8 @@ SProcXChangeKeyboardDevice(client)
  */
 
 int
-ProcXChangeKeyboardDevice (client)
-    register ClientPtr client;
-    {
+ProcXChangeKeyboardDevice (register ClientPtr client)
+{
     int				i;
     DeviceIntPtr 		xkbd = inputInfo.keyboard;
     DeviceIntPtr 		dev;
@@ -203,11 +201,8 @@ ProcXChangeKeyboardDevice (client)
  */
 
 void
-SRepXChangeKeyboardDevice (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xChangeKeyboardDeviceReply	*rep;
-    {
+SRepXChangeKeyboardDevice (ClientPtr client, int size, xChangeKeyboardDeviceReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
index 6b2a15aa2..24d36432b 100644
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@@ -79,9 +79,8 @@ SOFTWARE.
  */
 
 int
-SProcXChangeDeviceKeyMapping(client)
-    register ClientPtr client;
-    {
+SProcXChangeDeviceKeyMapping(register ClientPtr client)
+{
     register char n;
     register long *p;
     register int i, count;
@@ -106,9 +105,8 @@ SProcXChangeDeviceKeyMapping(client)
  */
 
 int
-ProcXChangeDeviceKeyMapping(client)
-    register ClientPtr client;
-    {
+ProcXChangeDeviceKeyMapping(register ClientPtr client)
+{
     int	ret;
     unsigned len;
     DeviceIntPtr dev;
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 20c654e2f..f379048f5 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -81,9 +81,8 @@ SOFTWARE.
  */
 
 int
-SProcXChangeDeviceDontPropagateList(client)
-    register ClientPtr client;
-    {
+SProcXChangeDeviceDontPropagateList(register ClientPtr client)
+{
     register char n;
     register long *p;
     register int i;
@@ -109,9 +108,8 @@ SProcXChangeDeviceDontPropagateList(client)
  */
 
 int
-ProcXChangeDeviceDontPropagateList (client)
-    register ClientPtr client;
-    {
+ProcXChangeDeviceDontPropagateList (register ClientPtr client)
+{
     int			i;
     WindowPtr		pWin;
     struct 		tmask tmp[EMASKSIZE];
diff --git a/Xi/chgptr.c b/Xi/chgptr.c
index bf2abd6b6..9fa5c2296 100644
--- a/Xi/chgptr.c
+++ b/Xi/chgptr.c
@@ -85,9 +85,8 @@ SOFTWARE.
  */
 
 int
-SProcXChangePointerDevice(client)
-    register ClientPtr client;
-    {
+SProcXChangePointerDevice(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xChangePointerDeviceReq);
@@ -103,9 +102,8 @@ SProcXChangePointerDevice(client)
  */
 
 int
-ProcXChangePointerDevice (client)
-    register ClientPtr client;
-    {
+ProcXChangePointerDevice (register ClientPtr client)
+{
     DeviceIntPtr 	xptr = inputInfo.pointer;
     DeviceIntPtr 	dev;
     ValuatorClassPtr 	v;
@@ -182,9 +180,8 @@ ProcXChangePointerDevice (client)
     }
 
 void
-DeleteFocusClassDeviceStruct(dev)
-    DeviceIntPtr dev;
-    {
+DeleteFocusClassDeviceStruct(DeviceIntPtr dev)
+{
     xfree(dev->focus->trace);
     xfree(dev->focus);
     dev->focus = NULL;
@@ -197,12 +194,8 @@ DeleteFocusClassDeviceStruct(dev)
  */
 
 void
-SendEventToAllWindows (dev, mask, ev, count)
-    DeviceIntPtr dev;
-    Mask mask;
-    xEvent *ev;
-    int count;
-    {
+SendEventToAllWindows (DeviceIntPtr dev, Mask mask, xEvent *ev, int count)
+{
     int i;
     WindowPtr pWin, p1;
 
@@ -223,13 +216,8 @@ SendEventToAllWindows (dev, mask, ev, count)
  */
 
 void
-FindInterestedChildren (dev, p1, mask, ev, count)
-    DeviceIntPtr	dev;
-    WindowPtr 		p1;
-    Mask		mask;
-    xEvent		*ev;
-    int			count;
-    {
+FindInterestedChildren (DeviceIntPtr dev, WindowPtr p1, Mask mask, xEvent *ev, int count)
+{
     WindowPtr p2;
 
     while (p1)
@@ -249,11 +237,8 @@ FindInterestedChildren (dev, p1, mask, ev, count)
  */
 
 void
-SRepXChangePointerDevice (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xChangePointerDeviceReply	*rep;
-    {
+SRepXChangePointerDevice (ClientPtr client, int size, xChangePointerDeviceReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/closedev.c b/Xi/closedev.c
index 8a57aeeee..dfd78005c 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -80,9 +80,8 @@ SOFTWARE.
  */
 
 int
-SProcXCloseDevice(client)
-    register ClientPtr client;
-    {
+SProcXCloseDevice(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xCloseDeviceReq);
@@ -98,9 +97,8 @@ SProcXCloseDevice(client)
  */
 
 int
-ProcXCloseDevice(client)
-    register ClientPtr client;
-    {
+ProcXCloseDevice(register ClientPtr client)
+{
     int			i;
     WindowPtr 		pWin, p1;
     DeviceIntPtr 	d;
@@ -142,11 +140,8 @@ ProcXCloseDevice(client)
  */
 
 void
-DeleteEventsFromChildren(dev, p1, client)
-    DeviceIntPtr	dev;
-    WindowPtr 		p1;
-    ClientPtr		client;
-    {
+DeleteEventsFromChildren(DeviceIntPtr dev, WindowPtr p1, ClientPtr client)
+{
     WindowPtr p2;
 
     while (p1)
@@ -166,11 +161,8 @@ DeleteEventsFromChildren(dev, p1, client)
  */
 
 void
-DeleteDeviceEvents (dev, pWin, client)
-    DeviceIntPtr	dev;
-    WindowPtr		pWin;
-    ClientPtr		client;
-    {
+DeleteDeviceEvents (DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
+{
     InputClientsPtr	others;
     OtherInputMasks	*pOthers;
     GrabPtr		grab, next;
diff --git a/Xi/devbell.c b/Xi/devbell.c
index bdc941c1c..c451db948 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -78,9 +78,8 @@ SOFTWARE.
  */
 
 int
-SProcXDeviceBell(client)
-    register ClientPtr client;
-    {
+SProcXDeviceBell(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xDeviceBellReq);
@@ -95,9 +94,8 @@ SProcXDeviceBell(client)
  */
 
 int
-ProcXDeviceBell (client)
-    register ClientPtr client;
-    {
+ProcXDeviceBell (register ClientPtr client)
+{
     DeviceIntPtr dev;
     KbdFeedbackPtr k;
     BellFeedbackPtr b;
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 71b8c16b5..4bd57988a 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -100,8 +100,7 @@ static Bool		MakeInputMasks (
  */
 
 void
-RegisterOtherDevice (device)
-    DeviceIntPtr device;
+RegisterOtherDevice (DeviceIntPtr device)
     {
     device->public.processInputProc = ProcessOtherEvent;
     device->public.realInputProc = ProcessOtherEvent;
@@ -111,10 +110,7 @@ RegisterOtherDevice (device)
 
 /*ARGSUSED*/
 void
-ProcessOtherEvent (xE, other, count)
-    xEventPtr xE;
-    register DeviceIntPtr other;
-    int count;
+ProcessOtherEvent (xEventPtr xE, register DeviceIntPtr other, int count)
     {
     register BYTE   	*kptr;
     register int    	i;
@@ -298,7 +294,7 @@ ProcessOtherEvent (xE, other, count)
     }
 
 _X_EXPORT int
-InitProximityClassDeviceStruct( DeviceIntPtr dev)
+InitProximityClassDeviceStruct(DeviceIntPtr dev)
 {
     register ProximityClassPtr proxc;
 
@@ -310,13 +306,8 @@ InitProximityClassDeviceStruct( DeviceIntPtr dev)
 }
 
 _X_EXPORT void
-InitValuatorAxisStruct(	DeviceIntPtr dev,
-						int axnum,
-						int minval,
-						int maxval,
-						int resolution,
-						int min_res,
-						int max_res )
+InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval,
+		       int resolution, int min_res, int max_res)
 {
     register AxisInfoPtr ax = dev->valuator->axes + axnum;
 
@@ -328,13 +319,8 @@ InitValuatorAxisStruct(	DeviceIntPtr dev,
 }
 
 static void
-FixDeviceStateNotify (
-    DeviceIntPtr dev,
-    deviceStateNotify *ev,
-    KeyClassPtr k,
-    ButtonClassPtr b,
-    ValuatorClassPtr v,
-    int first)
+FixDeviceStateNotify (DeviceIntPtr dev, deviceStateNotify *ev, KeyClassPtr k,
+		      ButtonClassPtr b, ValuatorClassPtr v, int first)
 {
     ev->type = DeviceStateNotify;
     ev->deviceid = dev->id;
@@ -373,11 +359,8 @@ FixDeviceStateNotify (
     }
 
 static void
-FixDeviceValuator (
-    DeviceIntPtr dev,
-    deviceValuator *ev,
-    ValuatorClassPtr v,
-    int first)
+FixDeviceValuator(DeviceIntPtr dev, deviceValuator *ev, ValuatorClassPtr v,
+		  int first)
 {
     int nval = v->numAxes - first;
 
@@ -398,10 +381,8 @@ FixDeviceValuator (
     }
 
 void
-DeviceFocusEvent(dev, type, mode, detail, pWin)
-    DeviceIntPtr dev;
-    int type, mode, detail;
-    register WindowPtr pWin;
+DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
+		 register WindowPtr pWin)
     {
     deviceFocus	event;
 
@@ -520,19 +501,10 @@ DeviceFocusEvent(dev, type, mode, detail, pWin)
     }
 
 int
-GrabButton(
-    ClientPtr client,
-    DeviceIntPtr dev,
-    BYTE this_device_mode,
-    BYTE other_devices_mode,
-    CARD16 modifiers,
-    DeviceIntPtr modifier_device,
-    CARD8 button,
-    Window grabWindow,
-    BOOL ownerEvents,
-    Cursor rcursor,
-    Window rconfineTo,
-    Mask eventMask)
+GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
+	   BYTE other_devices_mode, CARD16 modifiers,
+	   DeviceIntPtr modifier_device, CARD8 button, Window grabWindow,
+	   BOOL ownerEvents, Cursor rcursor, Window rconfineTo, Mask eventMask)
 {
     WindowPtr pWin, confineTo;
     CursorPtr cursor;
@@ -594,17 +566,9 @@ GrabButton(
     }
 
 int
-GrabKey(
-    ClientPtr client,
-    DeviceIntPtr dev,
-    BYTE this_device_mode,
-    BYTE other_devices_mode,
-    CARD16 modifiers,
-    DeviceIntPtr modifier_device,
-    CARD8 key,
-    Window grabWindow,
-    BOOL ownerEvents,
-    Mask mask)
+GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
+	BYTE other_devices_mode, CARD16 modifiers, DeviceIntPtr modifier_device,
+	CARD8 key, Window grabWindow, BOOL ownerEvents, Mask mask)
 {
     WindowPtr pWin;
     GrabPtr grab;
@@ -656,13 +620,8 @@ GrabKey(
     }
 
 int
-SelectForWindow(dev, pWin, client, mask, exclusivemasks, validmasks)
-	DeviceIntPtr dev;
-	WindowPtr pWin;
-	ClientPtr client;
-	Mask mask;
-	Mask exclusivemasks;
-	Mask validmasks;
+SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client, Mask mask,
+		Mask exclusivemasks, Mask validmasks)
 {
     int mskidx = dev->id;
     int i, ret;
@@ -731,11 +690,7 @@ maskSet:
 }
 
 int 
-AddExtensionClient (pWin, client, mask, mskidx)
-    WindowPtr pWin;
-    ClientPtr client;
-    Mask mask;
-    int mskidx;
+AddExtensionClient (WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
     {
     InputClientsPtr others;
 
@@ -757,8 +712,7 @@ AddExtensionClient (pWin, client, mask, mskidx)
     }
 
 static Bool
-MakeInputMasks (pWin)
-    WindowPtr	pWin;
+MakeInputMasks (WindowPtr pWin)
     {
     struct _OtherInputMasks *imasks;
 
@@ -772,8 +726,7 @@ MakeInputMasks (pWin)
     }
 
 void
-RecalculateDeviceDeliverableEvents(pWin)
-    WindowPtr pWin;
+RecalculateDeviceDeliverableEvents(WindowPtr pWin)
     {
     register InputClientsPtr others;
     struct _OtherInputMasks *inputMasks;   /* default: NULL */
@@ -814,9 +767,7 @@ RecalculateDeviceDeliverableEvents(pWin)
     }
 
 int
-InputClientGone(pWin, id)
-    register WindowPtr pWin;
-    XID   id;
+InputClientGone(register WindowPtr pWin, XID id)
     {
     register InputClientsPtr other, prev;
     if (!wOtherInputMasks(pWin))
@@ -861,18 +812,11 @@ InputClientGone(pWin, id)
 	prev = other;
         }
     FatalError("client not on device event list");
-    /*NOTREACHED*/
     }
 
 int
-SendEvent (client, d, dest, propagate, ev, mask, count)
-    ClientPtr		client;
-    DeviceIntPtr	d;
-    Window		dest;
-    Bool		propagate;
-    xEvent		*ev;
-    Mask		mask;
-    int			count;
+SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
+	  xEvent *ev, Mask mask, int count)
     {
     WindowPtr pWin;
     WindowPtr effectiveFocus = NullWindow; /* only set if dest==InputFocus */
@@ -938,11 +882,7 @@ SendEvent (client, d, dest, propagate, ev, mask, count)
     }
 
 int
-SetButtonMapping (client, dev, nElts, map)
-    ClientPtr client;
-    DeviceIntPtr dev;
-    int nElts;
-    BYTE *map;
+SetButtonMapping (ClientPtr client, DeviceIntPtr dev, int nElts, BYTE *map)
     {
     register int i;
     ButtonClassPtr b = dev->button;
@@ -967,14 +907,8 @@ SetButtonMapping (client, dev, nElts, map)
     }
 
 int 
-SetModifierMapping(client, dev, len, rlen, numKeyPerModifier, inputMap, k)
-    ClientPtr client;
-    DeviceIntPtr dev;
-    int len;
-    int rlen;
-    int numKeyPerModifier;
-    KeyCode *inputMap;
-    KeyClassPtr *k;
+SetModifierMapping(ClientPtr client, DeviceIntPtr dev, int len, int rlen,
+		   int numKeyPerModifier, KeyCode *inputMap, KeyClassPtr *k)
 {
     KeyCode *map = NULL;
     int inputMapLen;
@@ -1116,9 +1050,7 @@ ChangeKeyMapping(
     }
 
 void
-DeleteWindowFromAnyExtEvents(pWin, freeResources)
-    WindowPtr		pWin;
-    Bool		freeResources;
+DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources)
     {
     int			i;
     DeviceIntPtr	dev;
@@ -1147,9 +1079,7 @@ DeleteWindowFromAnyExtEvents(pWin, freeResources)
     }
 
 void
-DeleteDeviceFromAnyExtEvents(pWin, dev)
-    WindowPtr		pWin;
-    DeviceIntPtr	dev;
+DeleteDeviceFromAnyExtEvents(WindowPtr pWin, DeviceIntPtr dev)
     {
     WindowPtr		parent;
 
@@ -1216,9 +1146,7 @@ DeleteDeviceFromAnyExtEvents(pWin, dev)
     }
 
 int
-MaybeSendDeviceMotionNotifyHint (pEvents, mask)
-    deviceKeyButtonPointer *pEvents;
-    Mask mask;
+MaybeSendDeviceMotionNotifyHint (deviceKeyButtonPointer *pEvents, Mask mask)
     {
     DeviceIntPtr dev;
 
@@ -1242,13 +1170,9 @@ MaybeSendDeviceMotionNotifyHint (pEvents, mask)
     }
 
 void
-CheckDeviceGrabAndHintWindow (pWin, type, xE, grab, client, deliveryMask)
-    WindowPtr pWin;
-    int type;
-    deviceKeyButtonPointer *xE;
-    GrabPtr grab;
-    ClientPtr client;
-    Mask deliveryMask;
+CheckDeviceGrabAndHintWindow (WindowPtr pWin, int type,
+			      deviceKeyButtonPointer *xE, GrabPtr grab,
+			      ClientPtr client, Mask deliveryMask)
     {
     DeviceIntPtr dev;
 
@@ -1274,10 +1198,7 @@ CheckDeviceGrabAndHintWindow (pWin, type, xE, grab, client, deliveryMask)
     }
 
 Mask
-DeviceEventMaskForClient(dev, pWin, client)
-    DeviceIntPtr	dev;
-    WindowPtr		pWin;
-    ClientPtr		client;
+DeviceEventMaskForClient(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
     {
     register InputClientsPtr other;
 
@@ -1293,9 +1214,7 @@ DeviceEventMaskForClient(dev, pWin, client)
     }
 
 void
-MaybeStopDeviceHint(dev, client)
-    register DeviceIntPtr dev;
-    ClientPtr client;
+MaybeStopDeviceHint(register DeviceIntPtr dev, ClientPtr client)
 {
     WindowPtr pWin;
     GrabPtr grab = dev->grab;
@@ -1313,11 +1232,7 @@ MaybeStopDeviceHint(dev, client)
 }
 
 int
-DeviceEventSuppressForWindow(pWin, client, mask, maskndx)
-	WindowPtr pWin;
-	ClientPtr client;
-	Mask mask;
-	int maskndx;
+DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask, int maskndx)
     {
     struct _OtherInputMasks *inputMasks = wOtherInputMasks (pWin);
 
@@ -1346,9 +1261,7 @@ DeviceEventSuppressForWindow(pWin, client, mask, maskndx)
     }
 
 static Bool
-ShouldFreeInputMasks (pWin, ignoreSelectedEvents)
-    WindowPtr pWin;
-    Bool ignoreSelectedEvents;
+ShouldFreeInputMasks (WindowPtr pWin, Bool ignoreSelectedEvents)
     {
     int i;
     Mask allInputEventMasks = 0;
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 75dfb07f8..dceb6192c 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -219,7 +219,7 @@ static	XExtensionVersion	thisversion =
  */
 
 void
-XInputExtensionInit()
+XInputExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 
@@ -263,8 +263,7 @@ XInputExtensionInit()
  */
 
 int
-ProcIDispatch (client)
-    register ClientPtr client;
+ProcIDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     if (stuff->data == X_GetExtensionVersion)
@@ -354,8 +353,7 @@ ProcIDispatch (client)
  */
 
 int
-SProcIDispatch(client)
-    register ClientPtr client;
+SProcIDispatch(register ClientPtr client)
 {
     REQUEST(xReq);
     if (stuff->data == X_GetExtensionVersion)
@@ -448,10 +446,10 @@ SProcIDispatch(client)
 	SRepX##code (client, len, (x##code##Reply *) rep)
 
 void
-SReplyIDispatch (client, len, rep)
-    ClientPtr		client;
-    int			len;
-    xGrabDeviceReply	*rep;		/* All we look at is the type field */
+SReplyIDispatch (ClientPtr client, int len, xGrabDeviceReply *rep)
+             		       
+       			    
+                    	     		/* All we look at is the type field */
 {					/* This is common to all replies    */
     if (rep->RepType == X_GetExtensionVersion)
 	SRepXGetExtensionVersion (client, len, (xGetExtensionVersionReply *)rep);
@@ -510,9 +508,7 @@ SReplyIDispatch (client, len, rep)
 #define DO_SWAP(func,type) func ((type *)from, (type *)to)
 
 void
-SEventIDispatch (from, to)
-    xEvent	*from;
-    xEvent	*to;
+SEventIDispatch (xEvent *from, xEvent *to)
 {
     int		type = from->u.u.type & 0177;
 
@@ -580,10 +576,8 @@ SEventIDispatch (from, to)
  */
 
 void
-SEventDeviceValuator (from, to)
-    deviceValuator	*from;
-    deviceValuator	*to;
-    {
+SEventDeviceValuator (deviceValuator *from, deviceValuator *to)
+{
     register char	n;
     register int	i;
     INT32 *ip B32;
@@ -599,9 +593,7 @@ SEventDeviceValuator (from, to)
     }
 
 void
-SEventFocus (from, to)
-    deviceFocus	*from;
-    deviceFocus	*to;
+SEventFocus (deviceFocus *from, deviceFocus *to)
 {
     register char	n;
 
@@ -612,9 +604,7 @@ SEventFocus (from, to)
     }
 
 void
-SDeviceStateNotifyEvent (from, to)
-    deviceStateNotify	*from;
-    deviceStateNotify	*to;
+SDeviceStateNotifyEvent (deviceStateNotify *from, deviceStateNotify *to)
 {
     register int	i;
     register char	n;
@@ -631,9 +621,7 @@ SDeviceStateNotifyEvent (from, to)
     }
 
 void
-SDeviceKeyStateNotifyEvent (from, to)
-    deviceKeyStateNotify	*from;
-    deviceKeyStateNotify	*to;
+SDeviceKeyStateNotifyEvent (deviceKeyStateNotify *from, deviceKeyStateNotify *to)
 {
     register char	n;
 
@@ -642,9 +630,7 @@ SDeviceKeyStateNotifyEvent (from, to)
     }
 
 void
-SDeviceButtonStateNotifyEvent (from, to)
-    deviceButtonStateNotify	*from;
-    deviceButtonStateNotify	*to;
+SDeviceButtonStateNotifyEvent (deviceButtonStateNotify *from, deviceButtonStateNotify *to)
 {
     register char	n;
 
@@ -653,9 +639,7 @@ SDeviceButtonStateNotifyEvent (from, to)
     }
 
 void
-SChangeDeviceNotifyEvent (from, to)
-    changeDeviceNotify	*from;
-    changeDeviceNotify	*to;
+SChangeDeviceNotifyEvent (changeDeviceNotify *from, changeDeviceNotify *to)
 {
     register char	n;
 
@@ -665,9 +649,7 @@ SChangeDeviceNotifyEvent (from, to)
     }
 
 void
-SDeviceMappingNotifyEvent (from, to)
-    deviceMappingNotify	*from;
-    deviceMappingNotify	*to;
+SDeviceMappingNotifyEvent (deviceMappingNotify *from, deviceMappingNotify *to)
 {
     register char	n;
 
@@ -683,8 +665,7 @@ SDeviceMappingNotifyEvent (from, to)
  */
 
 void
-FixExtensionEvents (extEntry)
-    ExtensionEntry 	*extEntry;
+FixExtensionEvents (ExtensionEntry *extEntry)
 {
     Mask		mask;
 
@@ -786,7 +767,7 @@ FixExtensionEvents (extEntry)
  */
 
 void
-RestoreExtensionEvents ()
+RestoreExtensionEvents (void)
 {
     int	i;
 
@@ -834,9 +815,8 @@ RestoreExtensionEvents ()
  */
 
 void
-IResetProc(unused)
-    ExtensionEntry *unused;
-    {
+IResetProc(ExtensionEntry *unused)
+{
 
     ReplySwapVector[IReqCode] = ReplyNotSwappd;
     EventSwapVector[DeviceValuator] = NotImplemented;
@@ -864,10 +844,7 @@ IResetProc(unused)
  */
 
 _X_EXPORT void
-AssignTypeAndName (dev, type, name)
-    DeviceIntPtr dev;
-    Atom type;
-    char *name;
+AssignTypeAndName (DeviceIntPtr dev, Atom type, char *name)
 {
     dev->type = type;
     dev->name = (char *) xalloc(strlen(name)+1);
@@ -881,8 +858,8 @@ AssignTypeAndName (dev, type, name)
  */
 
 void
-MakeDeviceTypeAtoms ()
-    {
+MakeDeviceTypeAtoms (void)
+{
     int i;
 
     for (i=0; i<NUMTYPES; i++)
@@ -924,9 +901,8 @@ LookupDeviceIntRec (
  */
 
 void
-SetExclusiveAccess (mask)
-    Mask mask;
-    {
+SetExclusiveAccess (Mask mask)
+{
     int i;
 
     for (i=0; i<MAX_DEVICES; i++)
@@ -941,9 +917,8 @@ SetExclusiveAccess (mask)
  */
 
 void
-AllowPropagateSuppress (mask)
-    Mask mask;
-    {
+AllowPropagateSuppress (Mask mask)
+{
     int i;
 
     for (i=0; i<MAX_DEVICES; i++)
@@ -957,8 +932,8 @@ AllowPropagateSuppress (mask)
  */
 
 Mask 
-GetNextExtEventMask ()
-    {
+GetNextExtEventMask (void)
+{
     int i;
     Mask mask = lastExtEventMask;
 
@@ -980,10 +955,8 @@ GetNextExtEventMask ()
  */
 
 void
-SetMaskForExtEvent(mask, event)
-    Mask mask;
-    int event;
-    {
+SetMaskForExtEvent(Mask mask, int event)
+{
 
     EventInfo[ExtEventIndex].mask = mask;
     EventInfo[ExtEventIndex++].type = event;
@@ -1007,10 +980,8 @@ SetMaskForExtEvent(mask, event)
  */
 
 void
-SetEventInfo(mask, constant)
-    Mask mask;
-    int constant;
-    {
+SetEventInfo(Mask mask, int constant)
+{
     EventInfo[ExtEventIndex].mask = mask;
     EventInfo[ExtEventIndex++].type = constant;
     }
diff --git a/Xi/getbmap.c b/Xi/getbmap.c
index a944d4cc8..c4a411b24 100644
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@@ -77,9 +77,8 @@ SOFTWARE.
  */
 
 int
-SProcXGetDeviceButtonMapping(client)
-    register ClientPtr client;
-    {
+SProcXGetDeviceButtonMapping(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xGetDeviceButtonMappingReq);
@@ -94,9 +93,8 @@ SProcXGetDeviceButtonMapping(client)
  */
 
 int
-ProcXGetDeviceButtonMapping (client)
-    register ClientPtr client;
-    {
+ProcXGetDeviceButtonMapping (register ClientPtr client)
+{
     DeviceIntPtr	dev;
     xGetDeviceButtonMappingReply	rep;
     ButtonClassPtr	b;
@@ -141,11 +139,8 @@ ProcXGetDeviceButtonMapping (client)
  */
 
 void
-SRepXGetDeviceButtonMapping (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGetDeviceButtonMappingReply	*rep;
-    {
+SRepXGetDeviceButtonMapping (ClientPtr client, int size, xGetDeviceButtonMappingReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index 527273ac4..672824985 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -78,9 +78,8 @@ SOFTWARE.
  */
 
 int
-SProcXGetDeviceControl(client)
-    register ClientPtr client;
-    {
+SProcXGetDeviceControl(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xGetDeviceControlReq);
@@ -97,9 +96,8 @@ SProcXGetDeviceControl(client)
  */
 
 int
-ProcXGetDeviceControl(client)
-    ClientPtr client;
-    {
+ProcXGetDeviceControl(ClientPtr client)
+{
     int	total_length = 0;
     char *buf, *savbuf;
     register DeviceIntPtr dev;
@@ -172,12 +170,8 @@ ProcXGetDeviceControl(client)
  */
 
 void
-CopySwapDeviceResolution (client, v, buf, length)
-    ClientPtr 		client;
-    ValuatorClassPtr	v;
-    char 		*buf;
-    int			length;
-    {
+CopySwapDeviceResolution (ClientPtr client, ValuatorClassPtr v, char *buf, int length)
+{
     register char 	n;
     AxisInfoPtr	a;
     xDeviceResolutionState *r;
@@ -216,11 +210,8 @@ CopySwapDeviceResolution (client, v, buf, length)
  */
 
 void
-SRepXGetDeviceControl (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGetDeviceControlReply	*rep;
-    {
+SRepXGetDeviceControl (ClientPtr client, int size, xGetDeviceControlReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index 5652ad303..308b7ebf3 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -78,9 +78,8 @@ SOFTWARE.
  */
 
 int
-SProcXGetFeedbackControl(client)
-    register ClientPtr client;
-    {
+SProcXGetFeedbackControl(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xGetFeedbackControlReq);
@@ -95,9 +94,8 @@ SProcXGetFeedbackControl(client)
  */
 
 int
-ProcXGetFeedbackControl(client)
-    ClientPtr client;
-    {
+ProcXGetFeedbackControl(ClientPtr client)
+{
     int	total_length = 0;
     char *buf, *savbuf;
     register DeviceIntPtr dev;
@@ -201,11 +199,8 @@ ProcXGetFeedbackControl(client)
  */
 
 void
-CopySwapKbdFeedback (client, k, buf)
-    ClientPtr 		client;
-    KbdFeedbackPtr 	k;
-    char 		**buf;
-    {
+CopySwapKbdFeedback (ClientPtr client, KbdFeedbackPtr k, char **buf)
+{
     int	i;
     register char 	n;
     xKbdFeedbackState	*k2;
@@ -240,11 +235,8 @@ CopySwapKbdFeedback (client, k, buf)
  */
 
 void
-CopySwapPtrFeedback (client, p, buf)
-    ClientPtr 		client;
-    PtrFeedbackPtr 	p;
-    char 		**buf;
-    {
+CopySwapPtrFeedback (ClientPtr client, PtrFeedbackPtr p, char **buf)
+{
     register char 	n;
     xPtrFeedbackState	*p2;
 
@@ -272,11 +264,8 @@ CopySwapPtrFeedback (client, p, buf)
  */
 
 void
-CopySwapIntegerFeedback (client, i, buf)
-    ClientPtr 		client;
-    IntegerFeedbackPtr 	i;
-    char 		**buf;
-    {
+CopySwapIntegerFeedback (ClientPtr client, IntegerFeedbackPtr i, char **buf)
+{
     register char 		n;
     xIntegerFeedbackState	*i2;
 
@@ -304,11 +293,8 @@ CopySwapIntegerFeedback (client, i, buf)
  */
 
 void
-CopySwapStringFeedback (client, s, buf)
-    ClientPtr 		client;
-    StringFeedbackPtr 	s;
-    char 		**buf;
-    {
+CopySwapStringFeedback (ClientPtr client, StringFeedbackPtr s, char **buf)
+{
     int i;
     register char 		n;
     xStringFeedbackState	*s2;
@@ -346,11 +332,8 @@ CopySwapStringFeedback (client, s, buf)
  */
 
 void
-CopySwapLedFeedback (client, l, buf)
-    ClientPtr 		client;
-    LedFeedbackPtr 	l;
-    char 		**buf;
-    {
+CopySwapLedFeedback (ClientPtr client, LedFeedbackPtr l, char **buf)
+{
     register char 	n;
     xLedFeedbackState	*l2;
 
@@ -376,11 +359,8 @@ CopySwapLedFeedback (client, l, buf)
  */
 
 void
-CopySwapBellFeedback (client, b, buf)
-    ClientPtr 		client;
-    BellFeedbackPtr 	b;
-    char 		**buf;
-    {
+CopySwapBellFeedback (ClientPtr client, BellFeedbackPtr b, char **buf)
+{
     register char 	n;
     xBellFeedbackState	*b2;
 
@@ -408,11 +388,8 @@ CopySwapBellFeedback (client, b, buf)
  */
 
 void
-SRepXGetFeedbackControl (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGetFeedbackControlReply	*rep;
-    {
+SRepXGetFeedbackControl (ClientPtr client, int size, xGetFeedbackControlReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/getfocus.c b/Xi/getfocus.c
index 3c1597cc9..9cac93b0e 100644
--- a/Xi/getfocus.c
+++ b/Xi/getfocus.c
@@ -78,9 +78,8 @@ SOFTWARE.
  */
 
 int
-SProcXGetDeviceFocus(client)
-    register ClientPtr client;
-    {
+SProcXGetDeviceFocus(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xGetDeviceFocusReq);
@@ -95,9 +94,8 @@ SProcXGetDeviceFocus(client)
  */
 
 int
-ProcXGetDeviceFocus(client)
-    ClientPtr client;
-    {
+ProcXGetDeviceFocus(ClientPtr client)
+{
     DeviceIntPtr	dev;
     FocusClassPtr 	focus;
     xGetDeviceFocusReply rep;
@@ -142,11 +140,8 @@ ProcXGetDeviceFocus(client)
  */
 
 void
-SRepXGetDeviceFocus (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGetDeviceFocusReply	*rep;
-    {
+SRepXGetDeviceFocus (ClientPtr client, int size, xGetDeviceFocusReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index 4e67d9c71..5de044677 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -79,9 +79,8 @@ SOFTWARE.
  */
 
 int
-SProcXGetDeviceKeyMapping(client)
-    register ClientPtr client;
-    {
+SProcXGetDeviceKeyMapping(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xGetDeviceKeyMappingReq);
@@ -96,9 +95,8 @@ SProcXGetDeviceKeyMapping(client)
  */
 
 int
-ProcXGetDeviceKeyMapping(client)
-    register ClientPtr client;
-    {
+ProcXGetDeviceKeyMapping(register ClientPtr client)
+{
     xGetDeviceKeyMappingReply rep;
     DeviceIntPtr dev;
     KeySymsPtr	k;
@@ -164,11 +162,8 @@ ProcXGetDeviceKeyMapping(client)
  */
 
 void
-SRepXGetDeviceKeyMapping (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGetDeviceKeyMappingReply	*rep;
-    {
+SRepXGetDeviceKeyMapping (ClientPtr client, int size, xGetDeviceKeyMappingReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/getmmap.c b/Xi/getmmap.c
index 6b2e38d0b..310452a14 100644
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@@ -78,9 +78,8 @@ SOFTWARE.
  */
 
 int
-SProcXGetDeviceModifierMapping(client)
-    register ClientPtr client;
-    {
+SProcXGetDeviceModifierMapping(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xGetDeviceModifierMappingReq);
@@ -95,9 +94,8 @@ SProcXGetDeviceModifierMapping(client)
  */
 
 int
-ProcXGetDeviceModifierMapping(client)
-    ClientPtr client;
-    {
+ProcXGetDeviceModifierMapping(ClientPtr client)
+{
     CARD8				maxkeys;
     DeviceIntPtr			dev;
     xGetDeviceModifierMappingReply 	rep;
@@ -145,11 +143,8 @@ ProcXGetDeviceModifierMapping(client)
  */
 
 void
-SRepXGetDeviceModifierMapping (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGetDeviceModifierMappingReply	*rep;
-    {
+SRepXGetDeviceModifierMapping (ClientPtr client, int size, xGetDeviceModifierMappingReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/getprop.c b/Xi/getprop.c
index 2b4de1f3e..bbca24574 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -82,9 +82,8 @@ extern int	ExtEventIndex;
  */
 
 int
-SProcXGetDeviceDontPropagateList(client)
-    register ClientPtr client;
-    {
+SProcXGetDeviceDontPropagateList(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xGetDeviceDontPropagateListReq);
@@ -101,9 +100,8 @@ SProcXGetDeviceDontPropagateList(client)
  */
 
 int
-ProcXGetDeviceDontPropagateList (client)
-    register ClientPtr client;
-    {
+ProcXGetDeviceDontPropagateList (register ClientPtr client)
+{
     CARD16				count = 0;
     int					i;
     XEventClass				*buf = NULL, *tbuf;
@@ -167,13 +165,8 @@ ProcXGetDeviceDontPropagateList (client)
  */
 
 XEventClass
-*ClassFromMask (buf, mask, maskndx, count, mode)
-    XEventClass *buf;
-    Mask	mask;
-    int		maskndx;
-    CARD16	*count;
-    int		mode;
-    {
+*ClassFromMask (XEventClass *buf, Mask mask, int maskndx, CARD16 *count, int mode)
+{
     int		i,j;
     int		id = maskndx;
     Mask	tmask = 0x80000000;
@@ -201,11 +194,8 @@ XEventClass
  */
 
 void
-SRepXGetDeviceDontPropagateList (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGetDeviceDontPropagateListReply	*rep;
-    {
+SRepXGetDeviceDontPropagateList (ClientPtr client, int size, xGetDeviceDontPropagateListReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/getselev.c b/Xi/getselev.c
index c2ec2b9d5..41d321304 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -80,9 +80,8 @@ SOFTWARE.
  */
 
 int
-SProcXGetSelectedExtensionEvents(client)
-    register ClientPtr client;
-    {
+SProcXGetSelectedExtensionEvents(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xGetSelectedExtensionEventsReq);
@@ -100,9 +99,8 @@ SProcXGetSelectedExtensionEvents(client)
  */
 
 int
-ProcXGetSelectedExtensionEvents(client)
-    register ClientPtr client;
-    {
+ProcXGetSelectedExtensionEvents(register ClientPtr client)
+{
     int					i;
     int					total_length = 0;
     xGetSelectedExtensionEventsReply	rep;
@@ -181,11 +179,8 @@ ProcXGetSelectedExtensionEvents(client)
  */
 
 void
-SRepXGetSelectedExtensionEvents (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGetSelectedExtensionEventsReply	*rep;
-    {
+SRepXGetSelectedExtensionEvents (ClientPtr client, int size, xGetSelectedExtensionEventsReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/getvers.c b/Xi/getvers.c
index 1ad0ce785..efd2683e9 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -79,9 +79,8 @@ XExtensionVersion	AllExtensionVersions[128];
  */
 
 int
-SProcXGetExtensionVersion(client)
-    register ClientPtr client;
-    {
+SProcXGetExtensionVersion(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xGetExtensionVersionReq);
@@ -98,9 +97,8 @@ SProcXGetExtensionVersion(client)
  */
 
 int
-ProcXGetExtensionVersion (client)
-    register ClientPtr client;
-    {
+ProcXGetExtensionVersion (register ClientPtr client)
+{
     xGetExtensionVersionReply	rep;
 
     REQUEST(xGetExtensionVersionReq);
@@ -142,11 +140,8 @@ ProcXGetExtensionVersion (client)
  */
 
 void
-SRepXGetExtensionVersion (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGetExtensionVersionReply	*rep;
-    {
+SRepXGetExtensionVersion (ClientPtr client, int size, xGetExtensionVersionReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index 3b124a0f4..02071ac2c 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -83,9 +83,8 @@ extern int		ExtEventIndex;
  */
 
 int
-SProcXGrabDevice(client)
-    register ClientPtr client;
-    {
+SProcXGrabDevice(register ClientPtr client)
+{
     register char n;
     register long *p;
     register int i;
@@ -113,9 +112,8 @@ SProcXGrabDevice(client)
  */
 
 int
-ProcXGrabDevice(client)
-    ClientPtr client;
-    {
+ProcXGrabDevice(ClientPtr client)
+{
     int			error;
     xGrabDeviceReply 	rep;
     DeviceIntPtr 	dev;
@@ -167,14 +165,8 @@ ProcXGrabDevice(client)
  */
 
 int
-CreateMaskFromList (client, list, count, mask, dev, req)
-    ClientPtr		client;
-    XEventClass		*list;
-    int			count;
-    struct tmask	mask[];
-    DeviceIntPtr	dev;
-    int			req;
-    {
+CreateMaskFromList (ClientPtr client, XEventClass *list, int count, struct tmask *mask, DeviceIntPtr dev, int req)
+{
     int			i,j;
     int			device;
     DeviceIntPtr	tdev;
@@ -219,11 +211,8 @@ CreateMaskFromList (client, list, count, mask, dev, req)
  */
 
 void
-SRepXGrabDevice (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGrabDeviceReply	*rep;
-    {
+SRepXGrabDevice (ClientPtr client, int size, xGrabDeviceReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index 84f061086..b976244ef 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -80,9 +80,8 @@ SOFTWARE.
  */
 
 int
-SProcXGrabDeviceButton(client)
-    register ClientPtr client;
-    {
+SProcXGrabDeviceButton(register ClientPtr client)
+{
     register char n;
     register long *p;
     register int i;
@@ -110,9 +109,8 @@ SProcXGrabDeviceButton(client)
  */
 
 int
-ProcXGrabDeviceButton(client)
-    ClientPtr client;
-    {
+ProcXGrabDeviceButton(ClientPtr client)
+{
     int			ret;
     DeviceIntPtr	dev;
     DeviceIntPtr	mdev;
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index 17a9a9cf6..b0a40788e 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -80,9 +80,8 @@ SOFTWARE.
  */
 
 int
-SProcXGrabDeviceKey(client)
-    register ClientPtr client;
-    {
+SProcXGrabDeviceKey(register ClientPtr client)
+{
     register char n;
     register long *p;
     register int i;
@@ -109,9 +108,8 @@ SProcXGrabDeviceKey(client)
  */
 
 int
-ProcXGrabDeviceKey(client)
-    ClientPtr client;
-    {
+ProcXGrabDeviceKey(ClientPtr client)
+{
     int			ret;
     DeviceIntPtr 	dev;
     DeviceIntPtr 	mdev;
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index 02b1fee32..60de64e74 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -78,9 +78,8 @@ SOFTWARE.
  */
 
 int
-SProcXGetDeviceMotionEvents(client)
-register ClientPtr client;
-    {
+SProcXGetDeviceMotionEvents(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xGetDeviceMotionEventsReq);
@@ -98,8 +97,7 @@ register ClientPtr client;
  */
 
 int
-ProcXGetDeviceMotionEvents(client)
-    ClientPtr client;
+ProcXGetDeviceMotionEvents(ClientPtr client)
 {
     INT32 *coords = NULL, *bufptr;
     xGetDeviceMotionEventsReply rep;
@@ -199,11 +197,8 @@ ProcXGetDeviceMotionEvents(client)
  */
 
 void
-SRepXGetDeviceMotionEvents (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xGetDeviceMotionEventsReply	*rep;
-    {
+SRepXGetDeviceMotionEvents (ClientPtr client, int size, xGetDeviceMotionEventsReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/listdev.c b/Xi/listdev.c
index b7eed86b7..e8d47c1a4 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -80,9 +80,8 @@ SOFTWARE.
  */
 
 int
-SProcXListInputDevices(client)
-    register ClientPtr client;
-    {
+SProcXListInputDevices(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xListInputDevicesReq);
@@ -97,9 +96,8 @@ SProcXListInputDevices(client)
  */
 
 int
-ProcXListInputDevices (client)
-    register ClientPtr client;
-    {
+ProcXListInputDevices (register ClientPtr client)
+{
     xListInputDevicesReply	rep;
     int			numdevs;
     int 		namesize = 1;	/* need 1 extra byte for strcpy */
@@ -155,11 +153,8 @@ ProcXListInputDevices (client)
  */
 
 void
-SizeDeviceInfo (d, namesize, size)
-    DeviceIntPtr d;
-    int *namesize;
-    int *size;
-    {
+SizeDeviceInfo (DeviceIntPtr d, int *namesize, int *size)
+{
     int chunks;
 
     *namesize += 1;
@@ -184,14 +179,8 @@ SizeDeviceInfo (d, namesize, size)
  */
 
 void
-ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
-    ClientPtr client;
-    DeviceIntPtr d;
-    xDeviceInfoPtr dev;
-    char **devbuf;
-    char **classbuf;
-    char **namebuf;
-    {
+ListDeviceInfo (ClientPtr client, DeviceIntPtr d, xDeviceInfoPtr dev, char **devbuf, char **classbuf, char **namebuf)
+{
     CopyDeviceName (namebuf, d->name);
     CopySwapDevice (client, d, 0, devbuf);
     if (d->key != NULL)
@@ -221,10 +210,8 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
  */
 
 void
-CopyDeviceName (namebuf, name)
-    char **namebuf;
-    char *name;
-    {
+CopyDeviceName (char **namebuf, char *name)
+{
     char *nameptr = (char *) *namebuf;
 
     if (name)
@@ -247,12 +234,8 @@ CopyDeviceName (namebuf, name)
  */
 
 void
-CopySwapDevice (client, d, num_classes, buf)
-    register ClientPtr 	client;
-    DeviceIntPtr	d;
-    int			num_classes;
-    char 		**buf;
-    {
+CopySwapDevice (register ClientPtr client, DeviceIntPtr d, int num_classes, char **buf)
+{
     register char 	n;
     xDeviceInfoPtr dev;
 
@@ -281,11 +264,8 @@ CopySwapDevice (client, d, num_classes, buf)
  */
 
 void
-CopySwapKeyClass (client, k, buf)
-    register ClientPtr 	client;
-    KeyClassPtr 	k;
-    char 		**buf;
-    {
+CopySwapKeyClass (register ClientPtr client, KeyClassPtr k, char **buf)
+{
     register char 	n;
     xKeyInfoPtr 	k2;
 
@@ -309,11 +289,8 @@ CopySwapKeyClass (client, k, buf)
  */
 
 void
-CopySwapButtonClass (client, b, buf)
-    register ClientPtr 	client;
-    ButtonClassPtr 	b;
-    char 		**buf;
-    {
+CopySwapButtonClass (register ClientPtr client, ButtonClassPtr b, char **buf)
+{
     register char 	n;
     xButtonInfoPtr 	b2;
 
@@ -341,10 +318,7 @@ CopySwapButtonClass (client, b, buf)
  */
 
 int
-CopySwapValuatorClass (client, v, buf)
-    register ClientPtr 	client;
-    ValuatorClassPtr 	v;
-    char 		**buf;
+CopySwapValuatorClass (register ClientPtr client, ValuatorClassPtr v, char **buf)
 {
     int			i, j, axes, t_axes;
     register char 	n;
@@ -394,11 +368,8 @@ CopySwapValuatorClass (client, v, buf)
  */
 
 void
-SRepXListInputDevices (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xListInputDevicesReply	*rep;
-    {
+SRepXListInputDevices (ClientPtr client, int size, xListInputDevicesReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/opendev.c b/Xi/opendev.c
index 45bea7ae5..54a6dda46 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -82,9 +82,8 @@ extern	CARD8		event_base [];
  */
 
 int
-SProcXOpenDevice(client)
-    register ClientPtr client;
-    {
+SProcXOpenDevice(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xOpenDeviceReq);
@@ -99,9 +98,8 @@ SProcXOpenDevice(client)
  */
 
 int
-ProcXOpenDevice(client)
-    register ClientPtr client;
-    {
+ProcXOpenDevice(register ClientPtr client)
+{
     xInputClassInfo evbase [numInputClasses];
     Bool enableit = FALSE;
     int j=0;
@@ -192,11 +190,8 @@ ProcXOpenDevice(client)
  */
 
 void
-SRepXOpenDevice (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xOpenDeviceReply	*rep;
-    {
+SRepXOpenDevice (ClientPtr client, int size, xOpenDeviceReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/queryst.c b/Xi/queryst.c
index 34b140c8e..d125e2de3 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -60,9 +60,8 @@ from The Open Group.
  */
 
 int
-SProcXQueryDeviceState(client)
-    register ClientPtr client;
-    {
+SProcXQueryDeviceState(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xQueryDeviceStateReq);
@@ -77,9 +76,8 @@ SProcXQueryDeviceState(client)
  */
 
 int
-ProcXQueryDeviceState(client)
-    register ClientPtr client;
-    {
+ProcXQueryDeviceState(register ClientPtr client)
+{
     register char 		n;
     int 			i;
     int 			num_classes = 0;
@@ -202,11 +200,8 @@ ProcXQueryDeviceState(client)
  */
 
 void
-SRepXQueryDeviceState (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xQueryDeviceStateReply	*rep;
-    {
+SRepXQueryDeviceState (ClientPtr client, int size, xQueryDeviceStateReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/selectev.c b/Xi/selectev.c
index c8a55f5b0..057050c66 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -84,9 +84,8 @@ extern	Mask		ExtValidMasks[];
  */
 
 int
-SProcXSelectExtensionEvent (client)
-register ClientPtr client;
-    {
+SProcXSelectExtensionEvent (register ClientPtr client)
+{
     register char n;
     register long *p;
     register int i;
@@ -112,9 +111,8 @@ register ClientPtr client;
  */
 
 int
-ProcXSelectExtensionEvent (client)
-    register ClientPtr client;
-    {
+ProcXSelectExtensionEvent (register ClientPtr client)
+{
     int			ret;
     int			i;
     WindowPtr 		pWin;
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index c005aecab..50c1c584d 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -83,9 +83,8 @@ extern int 		lastEvent; 		/* Defined in extension.c */
  */
 
 int
-SProcXSendExtensionEvent(client)
-    register ClientPtr client;
-    {
+SProcXSendExtensionEvent(register ClientPtr client)
+{
     register char n;
     register long *p;
     register int i;
@@ -125,9 +124,8 @@ SProcXSendExtensionEvent(client)
  */
 
 int
-ProcXSendExtensionEvent (client)
-    register ClientPtr client;
-    {
+ProcXSendExtensionEvent (register ClientPtr client)
+{
     int			ret;
     DeviceIntPtr	dev;
     xEvent		*first;
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index 37db5110d..8dfeeea30 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -81,9 +81,8 @@ SOFTWARE.
  */
 
 int
-SProcXSetDeviceButtonMapping(client)
-    register ClientPtr client;
-    {
+SProcXSetDeviceButtonMapping(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xSetDeviceButtonMappingReq);
@@ -98,9 +97,8 @@ SProcXSetDeviceButtonMapping(client)
  */
 
 int
-ProcXSetDeviceButtonMapping (client)
-    register ClientPtr client;
-    {
+ProcXSetDeviceButtonMapping (register ClientPtr client)
+{
     int					ret;
     xSetDeviceButtonMappingReply	rep;
     DeviceIntPtr dev;
@@ -157,11 +155,8 @@ ProcXSetDeviceButtonMapping (client)
  */
 
 void
-SRepXSetDeviceButtonMapping (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xSetDeviceButtonMappingReply	*rep;
-    {
+SRepXSetDeviceButtonMapping (ClientPtr client, int size, xSetDeviceButtonMappingReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/setdval.c b/Xi/setdval.c
index 9b5b1e20d..0c40acbec 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -78,9 +78,8 @@ SOFTWARE.
  */
 
 int
-SProcXSetDeviceValuators(client)
-    register ClientPtr client;
-    {
+SProcXSetDeviceValuators(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xSetDeviceValuatorsReq);
@@ -95,9 +94,8 @@ SProcXSetDeviceValuators(client)
  */
 
 int
-ProcXSetDeviceValuators(client)
-    register ClientPtr client;
-    {
+ProcXSetDeviceValuators(register ClientPtr client)
+{
     DeviceIntPtr dev;
     xSetDeviceValuatorsReply	rep;
 
@@ -161,11 +159,8 @@ ProcXSetDeviceValuators(client)
  */
 
 void
-SRepXSetDeviceValuators (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xSetDeviceValuatorsReply	*rep;
-    {
+SRepXSetDeviceValuators (ClientPtr client, int size, xSetDeviceValuatorsReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/setfocus.c b/Xi/setfocus.c
index a1dd09d71..184dd7a7f 100644
--- a/Xi/setfocus.c
+++ b/Xi/setfocus.c
@@ -81,9 +81,8 @@ SOFTWARE.
  */
 
 int
-SProcXSetDeviceFocus(client)
-    register ClientPtr client;
-    {
+SProcXSetDeviceFocus(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xSetDeviceFocusReq);
@@ -101,9 +100,8 @@ SProcXSetDeviceFocus(client)
  */
 
 int
-ProcXSetDeviceFocus(client)
-    register ClientPtr client;
-    {
+ProcXSetDeviceFocus(register ClientPtr client)
+{
     int				ret;
     register DeviceIntPtr	dev;
 
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 3fa2c7e7e..430a7e395 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -79,9 +79,8 @@ SOFTWARE.
  */
 
 int
-SProcXSetDeviceModifierMapping(client)
-    register ClientPtr client;
-    {
+SProcXSetDeviceModifierMapping(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xSetDeviceModifierMappingReq);
@@ -96,9 +95,8 @@ SProcXSetDeviceModifierMapping(client)
  */
 
 int
-ProcXSetDeviceModifierMapping(client)
-    ClientPtr client;
-    {
+ProcXSetDeviceModifierMapping(ClientPtr client)
+{
     int					ret;
     xSetDeviceModifierMappingReply	rep;
     DeviceIntPtr			dev;
@@ -150,11 +148,8 @@ ProcXSetDeviceModifierMapping(client)
  */
 
 void
-SRepXSetDeviceModifierMapping (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xSetDeviceModifierMappingReply	*rep;
-    {
+SRepXSetDeviceModifierMapping (ClientPtr client, int size, xSetDeviceModifierMappingReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/setmode.c b/Xi/setmode.c
index f95ef5514..a6ea6f8ed 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -78,9 +78,8 @@ SOFTWARE.
  */
 
 int
-SProcXSetDeviceMode(client)
-    register ClientPtr client;
-    {
+SProcXSetDeviceMode(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xSetDeviceModeReq);
@@ -95,9 +94,8 @@ SProcXSetDeviceMode(client)
  */
 
 int
-ProcXSetDeviceMode(client)
-    register ClientPtr client;
-    {
+ProcXSetDeviceMode(register ClientPtr client)
+{
     DeviceIntPtr dev;
     xSetDeviceModeReply	rep;
 
@@ -145,11 +143,8 @@ ProcXSetDeviceMode(client)
  */
 
 void
-SRepXSetDeviceMode (client, size, rep)
-    ClientPtr	client;
-    int		size;
-    xSetDeviceModeReply	*rep;
-    {
+SRepXSetDeviceMode (ClientPtr client, int size, xSetDeviceModeReply *rep)
+{
     register char n;
 
     swaps(&rep->sequenceNumber, n);
diff --git a/Xi/stubs.c b/Xi/stubs.c
index 7ad6d903e..547a4cc5d 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -94,10 +94,8 @@ SOFTWARE.
  */
 
 int
-ChangeKeyboardDevice (old_dev, new_dev)
-    DeviceIntPtr	old_dev;
-    DeviceIntPtr	new_dev;
-    {
+ChangeKeyboardDevice (DeviceIntPtr old_dev, DeviceIntPtr new_dev)
+{
     /***********************************************************************
      DeleteFocusClassDeviceStruct(old_dev);	 * defined in xchgptr.c *
     **********************************************************************/
@@ -169,10 +167,8 @@ ChangePointerDevice (
  */
 
 void
-CloseInputDevice (d, client)
-    DeviceIntPtr d;
-    ClientPtr client;
-    {
+CloseInputDevice (DeviceIntPtr d, ClientPtr client)
+{
     }
 
 /***********************************************************************
@@ -202,8 +198,8 @@ CloseInputDevice (d, client)
  */
 
 void
-AddOtherInputDevices ()
-    {
+AddOtherInputDevices (void)
+{
     /**********************************************************************
      for each uninitialized device, do something like: 
 
@@ -242,11 +238,8 @@ AddOtherInputDevices ()
  */
 
 void
-OpenInputDevice (dev, client, status)
-    DeviceIntPtr dev;
-    ClientPtr client;
-    int *status;
-    {
+OpenInputDevice (DeviceIntPtr dev, ClientPtr client, int *status)
+{
     }
 
 /****************************************************************************
@@ -262,11 +255,8 @@ OpenInputDevice (dev, client, status)
  */
 
 int
-SetDeviceMode (client, dev, mode)
-    register	ClientPtr	client;
-    DeviceIntPtr dev;
-    int		mode;
-    {
+SetDeviceMode (register ClientPtr client, DeviceIntPtr dev, int mode)
+{
     return BadMatch;
     }
 
@@ -283,13 +273,8 @@ SetDeviceMode (client, dev, mode)
  */
 
 int
-SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators)
-    register	ClientPtr	client;
-    DeviceIntPtr dev;
-    int		*valuators;
-    int		first_valuator;
-    int		num_valuators;
-    {
+SetDeviceValuators (register ClientPtr client, DeviceIntPtr dev, int *valuators, int first_valuator, int num_valuators)
+{
     return BadMatch;
     }
 
@@ -302,11 +287,8 @@ SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators)
  */
 
 int
-ChangeDeviceControl (client, dev, control)
-    register	ClientPtr	client;
-    DeviceIntPtr dev;
-    xDeviceCtl	*control;
-    {
+ChangeDeviceControl (register ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
+{
     switch (control->control)
 	{
 	case DEVICE_RESOLUTION:
diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c
index 8de4cd225..d8c9f2039 100644
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@@ -77,9 +77,8 @@ SOFTWARE.
  */
 
 int
-SProcXUngrabDevice(client)
-register ClientPtr client;
-    {
+SProcXUngrabDevice(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xUngrabDeviceReq);
@@ -96,9 +95,8 @@ register ClientPtr client;
  */
 
 int
-ProcXUngrabDevice(client)
-register ClientPtr client;
-    {
+ProcXUngrabDevice(register ClientPtr client)
+{
     DeviceIntPtr 	dev;
     GrabPtr 		grab;
     TimeStamp 		time;
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index 8927a5c6e..6851930b7 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -83,9 +83,8 @@ SOFTWARE.
  */
 
 int
-SProcXUngrabDeviceButton(client)
-    register ClientPtr client;
-    {
+SProcXUngrabDeviceButton(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xUngrabDeviceButtonReq);
@@ -103,9 +102,8 @@ SProcXUngrabDeviceButton(client)
  */
 
 int
-ProcXUngrabDeviceButton(client)
-    ClientPtr client;
-    {
+ProcXUngrabDeviceButton(ClientPtr client)
+{
     DeviceIntPtr	dev;
     DeviceIntPtr	mdev;
     WindowPtr		pWin;
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index 38cfa1b71..87551ede2 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -83,9 +83,8 @@ SOFTWARE.
  */
 
 int
-SProcXUngrabDeviceKey(client)
-    register ClientPtr client;
-    {
+SProcXUngrabDeviceKey(register ClientPtr client)
+{
     register char n;
 
     REQUEST(xUngrabDeviceKeyReq);
@@ -103,9 +102,8 @@ SProcXUngrabDeviceKey(client)
  */
 
 int
-ProcXUngrabDeviceKey(client)
-    ClientPtr client;
-    {
+ProcXUngrabDeviceKey(ClientPtr client)
+{
     DeviceIntPtr	dev;
     DeviceIntPtr	mdev;
     WindowPtr 		pWin;