1 files changed, 255 insertions, 327 deletions

diff --git a/nx-X11/programs/Xserver/Xi/chgfctl.c b/nx-X11/programs/Xserver/Xi/chgfctl.c
index a5ad73d11..31cb0a09e 100644
--- a/nx-X11/programs/Xserver/Xi/chgfctl.c
+++ b/nx-X11/programs/Xserver/Xi/chgfctl.c
@@ -55,14 +55,14 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <nx-X11/X.h>				/* for inputstr.h    */
-#include <nx-X11/Xproto.h>			/* Request macro     */
-#include "inputstr.h"			/* DeviceIntPtr	     */
+#include <nx-X11/X.h>	/* for inputstr.h    */
+#include <nx-X11/Xproto.h>	/* Request macro     */
+#include "inputstr.h"	/* DeviceIntPtr      */
 #include <nx-X11/extensions/XI.h>
-#include <nx-X11/extensions/XIproto.h>			/* control constants */
+#include <nx-X11/extensions/XIproto.h>	/* control constants */
 
 #include "extnsionst.h"
-#include "extinit.h"			/* LookupDeviceIntRec */
+#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "chgfctl.h"
@@ -77,15 +77,14 @@ SOFTWARE.
  */
 
 int
-SProcXChangeFeedbackControl(client)
-    register ClientPtr client;
-    {
+SProcXChangeFeedbackControl(register ClientPtr client)
+{
     REQUEST(xChangeFeedbackControlReq);
     swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xChangeFeedbackControlReq);
     swapl(&stuff->mask);
-    return(ProcXChangeFeedbackControl(client));
-    }
+    return (ProcXChangeFeedbackControl(client));
+}
 
 /***********************************************************************
  *
@@ -94,9 +93,8 @@ SProcXChangeFeedbackControl(client)
  */
 
 int
-ProcXChangeFeedbackControl(client)
-    ClientPtr client;
-    {
+ProcXChangeFeedbackControl(ClientPtr client)
+{
     unsigned len;
     DeviceIntPtr dev;
     KbdFeedbackPtr k;
@@ -109,117 +107,109 @@ ProcXChangeFeedbackControl(client)
     REQUEST(xChangeFeedbackControlReq);
     REQUEST_AT_LEAST_SIZE(xChangeFeedbackControlReq);
 
-    len = stuff->length - (sizeof(xChangeFeedbackControlReq) >>2);
-    dev = LookupDeviceIntRec (stuff->deviceid);
-    if (dev == NULL)
-	{
-	SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadDevice);
+    len = stuff->length - (sizeof(xChangeFeedbackControlReq) >> 2);
+    dev = LookupDeviceIntRec(stuff->deviceid);
+    if (dev == NULL) {
+	SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			  BadDevice);
 	return Success;
-	}
+    }
 
-    switch (stuff->feedbackid)
-	{
-	case KbdFeedbackClass:
-	    if (len != (sizeof(xKbdFeedbackCtl)>>2))
-		{
-		SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 
-			0, BadLength);
+    switch (stuff->feedbackid) {
+    case KbdFeedbackClass:
+	if (len != (sizeof(xKbdFeedbackCtl) >> 2)) {
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+			      0, BadLength);
+	    return Success;
+	}
+	for (k = dev->kbdfeed; k; k = k->next)
+	    if (k->ctrl.id == ((xKbdFeedbackCtl *) & stuff[1])->id) {
+		ChangeKbdFeedback(client, dev, stuff->mask, k,
+				  (xKbdFeedbackCtl *) & stuff[1]);
 		return Success;
-		}
-	    for (k=dev->kbdfeed; k; k=k->next)
-		if (k->ctrl.id == ((xKbdFeedbackCtl *) &stuff[1])->id)
-		    {
-		    ChangeKbdFeedback (client, dev, stuff->mask, k, (xKbdFeedbackCtl *)&stuff[1]);
-		    return Success;
-		    }
-	    break;
-	case PtrFeedbackClass:
-	    if (len != (sizeof(xPtrFeedbackCtl)>>2))
-		{
-		SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 
-			0, BadLength);
+	    }
+	break;
+    case PtrFeedbackClass:
+	if (len != (sizeof(xPtrFeedbackCtl) >> 2)) {
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+			      0, BadLength);
+	    return Success;
+	}
+	for (p = dev->ptrfeed; p; p = p->next)
+	    if (p->ctrl.id == ((xPtrFeedbackCtl *) & stuff[1])->id) {
+		ChangePtrFeedback(client, dev, stuff->mask, p,
+				  (xPtrFeedbackCtl *) & stuff[1]);
 		return Success;
-		}
-	    for (p=dev->ptrfeed; p; p=p->next)
-		if (p->ctrl.id == ((xPtrFeedbackCtl *) &stuff[1])->id)
-		    {
-		    ChangePtrFeedback (client, dev, stuff->mask, p, (xPtrFeedbackCtl *)&stuff[1]);
-		    return Success;
-		    }
-	    break;
-	case StringFeedbackClass:
-	    {
-	    xStringFeedbackCtl *f = ((xStringFeedbackCtl *) &stuff[1]);
+	    }
+	break;
+    case StringFeedbackClass:
+    {
+	xStringFeedbackCtl *f = ((xStringFeedbackCtl *) & stuff[1]);
 	    if (client->swapped)
 		{
 		if (len < (sizeof(xStringFeedbackCtl) + 3) >> 2)
 		    return BadLength;
 		swaps(&f->num_keysyms);
-		}
-	    if (len != ((sizeof(xStringFeedbackCtl)>>2) + f->num_keysyms))
-		{
-		SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 
-			0, BadLength);
+	}
+	if (len != ((sizeof(xStringFeedbackCtl) >> 2) + f->num_keysyms)) {
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+			      0, BadLength);
+	    return Success;
+	}
+	for (s = dev->stringfeed; s; s = s->next)
+	    if (s->ctrl.id == ((xStringFeedbackCtl *) & stuff[1])->id) {
+		ChangeStringFeedback(client, dev, stuff->mask, s,
+				     (xStringFeedbackCtl *) & stuff[1]);
 		return Success;
-		}
-	    for (s=dev->stringfeed; s; s=s->next)
-		if (s->ctrl.id == ((xStringFeedbackCtl *) &stuff[1])->id)
-		    {
-		    ChangeStringFeedback (client, dev, stuff->mask,s,(xStringFeedbackCtl *)&stuff[1]);
-		    return Success;
-		    }
-	    break;
 	    }
-	case IntegerFeedbackClass:
-	    if (len != (sizeof(xIntegerFeedbackCtl)>>2))
-		{
-		SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 
-			0, BadLength);
-		return Success;
-		}
-	    for (i=dev->intfeed; i; i=i->next)
-		if (i->ctrl.id == ((xIntegerFeedbackCtl *) &stuff[1])->id)
-		    {
-		    ChangeIntegerFeedback (client, dev,stuff->mask,i,(xIntegerFeedbackCtl *)&stuff[1]);
-		    return Success;
-		    }
-	    break;
-	case LedFeedbackClass:
-	    if (len != (sizeof(xLedFeedbackCtl)>>2))
-		{
-		SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 
-			0, BadLength);
+	break;
+    }
+    case IntegerFeedbackClass:
+	if (len != (sizeof(xIntegerFeedbackCtl) >> 2)) {
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+			      0, BadLength);
+	    return Success;
+	}
+	for (i = dev->intfeed; i; i = i->next)
+	    if (i->ctrl.id == ((xIntegerFeedbackCtl *) & stuff[1])->id) {
+		ChangeIntegerFeedback(client, dev, stuff->mask, i,
+				      (xIntegerFeedbackCtl *) & stuff[1]);
 		return Success;
-		}
-	    for (l=dev->leds; l; l=l->next)
-		if (l->ctrl.id == ((xLedFeedbackCtl *) &stuff[1])->id)
-		    {
-		    ChangeLedFeedback (client, dev, stuff->mask, l, (xLedFeedbackCtl *)&stuff[1]);
-		    return Success;
-		    }
-	    break;
-	case BellFeedbackClass:
-	    if (len != (sizeof(xBellFeedbackCtl)>>2))
-		{
-		SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 
-			0, BadLength);
+	    }
+	break;
+    case LedFeedbackClass:
+	if (len != (sizeof(xLedFeedbackCtl) >> 2)) {
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+			      0, BadLength);
+	    return Success;
+	}
+	for (l = dev->leds; l; l = l->next)
+	    if (l->ctrl.id == ((xLedFeedbackCtl *) & stuff[1])->id) {
+		ChangeLedFeedback(client, dev, stuff->mask, l,
+				  (xLedFeedbackCtl *) & stuff[1]);
 		return Success;
-		}
-	    for (b=dev->bell; b; b=b->next)
-		if (b->ctrl.id == ((xBellFeedbackCtl *) &stuff[1])->id)
-		    {
-		    ChangeBellFeedback (client, dev, stuff->mask, b, (xBellFeedbackCtl *)&stuff[1]);
-		    return Success;
-		    }
-	    break;
-	default:
-	    break;
+	    }
+	break;
+    case BellFeedbackClass:
+	if (len != (sizeof(xBellFeedbackCtl) >> 2)) {
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+			      0, BadLength);
+	    return Success;
 	}
+	for (b = dev->bell; b; b = b->next)
+	    if (b->ctrl.id == ((xBellFeedbackCtl *) & stuff[1])->id) {
+		ChangeBellFeedback(client, dev, stuff->mask, b,
+				   (xBellFeedbackCtl *) & stuff[1]);
+		return Success;
+	    }
+	break;
+    default:
+	break;
+    }
 
-    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, BadMatch);
+    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0, BadMatch);
     return Success;
-    } 
+}
 
 /******************************************************************************
  *
@@ -228,132 +218,110 @@ 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)
+{
     KeybdCtrl kctrl;
     int t;
     int key = DO_ALL;
 
-    if (client->swapped)
-	{
+    if (client->swapped) {
 	swaps(&f->length);
 	swaps(&f->pitch);
 	swaps(&f->duration);
 	swapl(&f->led_mask);
 	swapl(&f->led_values);
-	}
+    }
 
     kctrl = k->ctrl;
-    if (mask & DvKeyClickPercent)
-	{
+    if (mask & DvKeyClickPercent) {
 	t = f->click;
 	if (t == -1)
 	    t = defaultKeyboardControl.click;
-	else if (t < 0 || t > 100)
-	    {
+	else if (t < 0 || t > 100) {
 	    client->errorValue = t;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
+	}
 	kctrl.click = t;
-        }
+    }
 
-    if (mask & DvPercent)
-	{
+    if (mask & DvPercent) {
 	t = f->percent;
 	if (t == -1)
 	    t = defaultKeyboardControl.bell;
-	else if (t < 0 || t > 100)
-	    {
+	else if (t < 0 || t > 100) {
 	    client->errorValue = t;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
-	kctrl.bell = t;
 	}
+	kctrl.bell = t;
+    }
 
-    if (mask & DvPitch)
-	{
+    if (mask & DvPitch) {
 	t = f->pitch;
 	if (t == -1)
 	    t = defaultKeyboardControl.bell_pitch;
-	else if (t < 0)
-	    {
+	else if (t < 0) {
 	    client->errorValue = t;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
-	kctrl.bell_pitch = t;
 	}
+	kctrl.bell_pitch = t;
+    }
 
-    if (mask & DvDuration)
-	{
+    if (mask & DvDuration) {
 	t = f->duration;
 	if (t == -1)
 	    t = defaultKeyboardControl.bell_duration;
-	else if (t < 0)
-	    {
+	else if (t < 0) {
 	    client->errorValue = t;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
+	}
 	kctrl.bell_duration = t;
-        }
+    }
 
-    if (mask & DvLed)
-        {
+    if (mask & DvLed) {
 	kctrl.leds &= ~(f->led_mask);
 	kctrl.leds |= (f->led_mask & f->led_values);
-        }
+    }
 
-    if (mask & DvKey)
-	{
+    if (mask & DvKey) {
 	key = (KeyCode) f->key;
-	if (key < 8 || key > 255)
-	    {
+	if (key < 8 || key > 255) {
 	    client->errorValue = key;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
-	if (!(mask & DvAutoRepeatMode))
-	    {
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadMatch);
+	}
+	if (!(mask & DvAutoRepeatMode)) {
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadMatch);
 	    return Success;
-	    }
 	}
+    }
 
-    if (mask & DvAutoRepeatMode)
-	{
+    if (mask & DvAutoRepeatMode) {
 	int inx = (key >> 3);
 	int kmask = (1 << (key & 7));
+
 	t = (CARD8) f->auto_repeat_mode;
-	if (t == AutoRepeatModeOff)
-	    {
+	if (t == AutoRepeatModeOff) {
 	    if (key == DO_ALL)
 		kctrl.autoRepeat = FALSE;
 	    else
 		kctrl.autoRepeats[inx] &= ~kmask;
-	    }
-	else if (t == AutoRepeatModeOn)
-	    {
+	} else if (t == AutoRepeatModeOn) {
 	    if (key == DO_ALL)
 		kctrl.autoRepeat = TRUE;
 	    else
 		kctrl.autoRepeats[inx] |= kmask;
-	    }
-	else if (t == AutoRepeatModeDefault)
-	    {
+	} else if (t == AutoRepeatModeDefault) {
 	    if (key == DO_ALL)
 		kctrl.autoRepeat = defaultKeyboardControl.autoRepeat;
 	    else
@@ -361,20 +329,18 @@ ChangeKbdFeedback (client, dev, mask, k, f)
 	    kctrl.autoRepeats[inx] =
 		(kctrl.autoRepeats[inx] & ~kmask) |
 		(defaultKeyboardControl.autoRepeats[inx] & kmask);
-	    }
-	else
-	    {
+	} else {
 	    client->errorValue = t;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
-        }
+	}
+    }
 
     k->ctrl = kctrl;
-    (*k->CtrlProc)(dev, &k->ctrl);
+    (*k->CtrlProc) (dev, &k->ctrl);
     return Success;
-    }
+}
 
 /******************************************************************************
  *
@@ -383,79 +349,68 @@ ChangeKbdFeedback (client, dev, mask, k, f)
  */
 
 int
-ChangePtrFeedback (client, dev, mask, p, f)
-    ClientPtr 		client;
-    DeviceIntPtr 	dev;
-    unsigned long 	mask;
-    PtrFeedbackPtr 	p;
-    xPtrFeedbackCtl 	*f;
-    {
-    PtrCtrl pctrl;		/* might get BadValue part way through */
+ChangePtrFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+		  PtrFeedbackPtr p, xPtrFeedbackCtl * f)
+{
+    PtrCtrl pctrl;	/* might get BadValue part way through */
 
-    if (client->swapped)
-	{
+    if (client->swapped) {
 	swaps(&f->length);
 	swaps(&f->num);
 	swaps(&f->denom);
 	swaps(&f->thresh);
-	}
+    }
 
     pctrl = p->ctrl;
-    if (mask & DvAccelNum)
-	{
-	int	accelNum;
+    if (mask & DvAccelNum) {
+	int accelNum;
 
 	accelNum = f->num;
 	if (accelNum == -1)
 	    pctrl.num = defaultPointerControl.num;
-	else if (accelNum < 0)
-	    {
+	else if (accelNum < 0) {
 	    client->errorValue = accelNum;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
-	else pctrl.num = accelNum;
-	}
+	} else
+	    pctrl.num = accelNum;
+    }
 
-    if (mask & DvAccelDenom)
-	{
-	int	accelDenom;
+    if (mask & DvAccelDenom) {
+	int accelDenom;
 
 	accelDenom = f->denom;
 	if (accelDenom == -1)
 	    pctrl.den = defaultPointerControl.den;
-	else if (accelDenom <= 0)
-	    {
+	else if (accelDenom <= 0) {
 	    client->errorValue = accelDenom;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
-	else pctrl.den = accelDenom;
-        }
+	} else
+	    pctrl.den = accelDenom;
+    }
 
-    if (mask & DvThreshold)
-	{
-	int	threshold;
+    if (mask & DvThreshold) {
+	int threshold;
 
 	threshold = f->thresh;
 	if (threshold == -1)
 	    pctrl.threshold = defaultPointerControl.threshold;
-	else if (threshold < 0)
-	    {
+	else if (threshold < 0) {
 	    client->errorValue = threshold;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
-	else pctrl.threshold = threshold;
-        }
+	} else
+	    pctrl.threshold = threshold;
+    }
 
     p->ctrl = pctrl;
-    (*p->CtrlProc)(dev, &p->ctrl);
+    (*p->CtrlProc) (dev, &p->ctrl);
     return Success;
-    }
+}
 
 /******************************************************************************
  *
@@ -464,23 +419,19 @@ ChangePtrFeedback (client, dev, mask, p, f)
  */
 
 int
-ChangeIntegerFeedback (client, dev, mask, i, f)
-    ClientPtr 			client;
-    DeviceIntPtr 		dev;
-    unsigned long 		mask;
-    IntegerFeedbackPtr 		i;
-    xIntegerFeedbackCtl 	*f;
-    {
-    if (client->swapped)
-	{
+ChangeIntegerFeedback(ClientPtr client, DeviceIntPtr dev,
+		      long unsigned int mask, IntegerFeedbackPtr i,
+		      xIntegerFeedbackCtl * f)
+{
+    if (client->swapped) {
 	swaps(&f->length);
 	swapl(&f->int_to_display);
-	}
+    }
 
     i->ctrl.integer_displayed = f->int_to_display;
-    (*i->CtrlProc)(dev, &i->ctrl);
+    (*i->CtrlProc) (dev, &i->ctrl);
     return Success;
-    }
+}
 
 /******************************************************************************
  *
@@ -489,49 +440,42 @@ ChangeIntegerFeedback (client, dev, mask, i, f)
  */
 
 int
-ChangeStringFeedback (client, dev, mask, s, f)
-    ClientPtr 		client;
-    DeviceIntPtr 	dev;
-    unsigned long 	mask;
-    StringFeedbackPtr 	s;
-    xStringFeedbackCtl 	*f;
-    {
-    int		i, j;
-    KeySym	*syms, *sup_syms;
-
-    syms = (KeySym *) (f+1);
-    if (client->swapped)
-	{
+ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev,
+		     long unsigned int mask, StringFeedbackPtr s,
+		     xStringFeedbackCtl * f)
+{
+    int i, j;
+    KeySym *syms, *sup_syms;
+
+    syms = (KeySym *) (f + 1);
+    if (client->swapped) {
 	swaps(&f->length);	/* swapped num_keysyms in calling proc */
 	SwapLongs((CARD32 *) syms, f->num_keysyms);
-	}
+    }
 
-    if (f->num_keysyms > s->ctrl.max_symbols)
-	{
-	SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0, 
-	    BadValue);
+    if (f->num_keysyms > s->ctrl.max_symbols) {
+	SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			  BadValue);
 	return Success;
-	}
+    }
     sup_syms = s->ctrl.symbols_supported;
-    for (i=0; i<f->num_keysyms; i++)
-	{
-        for (j=0; j<s->ctrl.num_symbols_supported; j++)
-	    if (*(syms+i) == *(sup_syms+j))
+    for (i = 0; i < f->num_keysyms; i++) {
+	for (j = 0; j < s->ctrl.num_symbols_supported; j++)
+	    if (*(syms + i) == *(sup_syms + j))
 		break;
-	if (j==s->ctrl.num_symbols_supported)
-	    {
-	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadMatch);
+	if (j == s->ctrl.num_symbols_supported) {
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadMatch);
 	    return Success;
-	    }
 	}
+    }
 
-    s->ctrl.num_symbols_displayed  = f->num_keysyms;
-    for (i=0; i<f->num_keysyms; i++)
-	*(s->ctrl.symbols_displayed+i) = *(syms+i);
-    (*s->CtrlProc)(dev, &s->ctrl);
+    s->ctrl.num_symbols_displayed = f->num_keysyms;
+    for (i = 0; i < f->num_keysyms; i++)
+	*(s->ctrl.symbols_displayed + i) = *(syms + i);
+    (*s->CtrlProc) (dev, &s->ctrl);
     return Success;
-    }
+}
 
 /******************************************************************************
  *
@@ -540,72 +484,62 @@ 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)
+{
     int t;
-    BellCtrl bctrl;		/* might get BadValue part way through */
+    BellCtrl bctrl;	/* might get BadValue part way through */
 
-    if (client->swapped)
-	{
+    if (client->swapped) {
 	swaps(&f->length);
 	swaps(&f->pitch);
 	swaps(&f->duration);
-	}
+    }
 
     bctrl = b->ctrl;
-    if (mask & DvPercent)
-	{
+    if (mask & DvPercent) {
 	t = f->percent;
 	if (t == -1)
 	    t = defaultKeyboardControl.bell;
-	else if (t < 0 || t > 100)
-	    {
+	else if (t < 0 || t > 100) {
 	    client->errorValue = t;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
-	bctrl.percent = t;
 	}
+	bctrl.percent = t;
+    }
 
-    if (mask & DvPitch)
-	{
+    if (mask & DvPitch) {
 	t = f->pitch;
 	if (t == -1)
 	    t = defaultKeyboardControl.bell_pitch;
-	else if (t < 0)
-	    {
+	else if (t < 0) {
 	    client->errorValue = t;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
-	bctrl.pitch = t;
 	}
+	bctrl.pitch = t;
+    }
 
-    if (mask & DvDuration)
-	{
+    if (mask & DvDuration) {
 	t = f->duration;
 	if (t == -1)
 	    t = defaultKeyboardControl.bell_duration;
-	else if (t < 0)
-	    {
+	else if (t < 0) {
 	    client->errorValue = t;
-	    SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, 
-		BadValue);
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+			      BadValue);
 	    return Success;
-	    }
+	}
 	bctrl.duration = t;
-        }
+    }
     b->ctrl = bctrl;
-    (*b->CtrlProc)(dev, &b->ctrl);
+    (*b->CtrlProc) (dev, &b->ctrl);
     return Success;
-    }
+}
 
 /******************************************************************************
  *
@@ -614,32 +548,26 @@ ChangeBellFeedback (client, dev, mask, b, f)
  */
 
 int
-ChangeLedFeedback (client, dev, mask, l, f)
-    ClientPtr 		client;
-    DeviceIntPtr 	dev;
-    unsigned long 	mask;
-    LedFeedbackPtr 	l;
-    xLedFeedbackCtl 	*f;
-    {
-    LedCtrl lctrl;		/* might get BadValue part way through */
+ChangeLedFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+		  LedFeedbackPtr l, xLedFeedbackCtl * f)
+{
+    LedCtrl lctrl;	/* might get BadValue part way through */
 
-    if (client->swapped)
-	{
+    if (client->swapped) {
 	swaps(&f->length);
 	swapl(&f->led_values);
 	swapl(&f->led_mask);
-	}
+    }
 
     f->led_mask &= l->ctrl.led_mask;	/* set only supported leds */
     f->led_values &= l->ctrl.led_mask;	/* set only supported leds */
-    if (mask & DvLed)
-        {
+    if (mask & DvLed) {
 	lctrl.led_mask = f->led_mask;
 	lctrl.led_values = f->led_values;
-	(*l->CtrlProc)(dev, &lctrl);
-	l->ctrl.led_values &= ~(f->led_mask);		/* zero changed leds */
-	l->ctrl.led_values |= (f->led_mask & f->led_values);/* OR in set leds*/
-        }
+	(*l->CtrlProc) (dev, &lctrl);
+	l->ctrl.led_values &= ~(f->led_mask);	/* zero changed leds */
+	l->ctrl.led_values |= (f->led_mask & f->led_values);	/* OR in set leds */
+    }
 
     return Success;
-    }
+}