indent fixes (OMG SO UGLY), and nuke old RCS keywords.

1 files changed, 134 insertions, 155 deletions

diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index 308b7ebf3..870348fbb 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -1,5 +1,3 @@
-/* $Xorg: getfctl.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */
-
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
@@ -45,7 +43,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.3 2001/01/17 22:13:24 dawes Exp $ */
 
 /********************************************************************
  *
@@ -53,19 +50,19 @@ SOFTWARE.
  *
  */
 
-#define	 NEED_EVENTS			/* for inputstr.h    */
+#define	 NEED_EVENTS	/* for inputstr.h    */
 #define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
-#include "inputstr.h"			/* DeviceIntPtr	     */
+#include <X11/X.h>	/* for inputstr.h    */
+#include <X11/Xproto.h>	/* Request macro     */
+#include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
-#include "extinit.h"			/* LookupDeviceIntRec */
+#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "getfctl.h"
@@ -84,8 +81,8 @@ SProcXGetFeedbackControl(register ClientPtr client)
 
     REQUEST(xGetFeedbackControlReq);
     swaps(&stuff->length, n);
-    return(ProcXGetFeedbackControl(client));
-    }
+    return (ProcXGetFeedbackControl(client));
+}
 
 /***********************************************************************
  *
@@ -96,7 +93,7 @@ SProcXGetFeedbackControl(register ClientPtr client)
 int
 ProcXGetFeedbackControl(ClientPtr client)
 {
-    int	total_length = 0;
+    int total_length = 0;
     char *buf, *savbuf;
     register DeviceIntPtr dev;
     KbdFeedbackPtr k;
@@ -110,13 +107,11 @@ ProcXGetFeedbackControl(ClientPtr client)
     REQUEST(xGetFeedbackControlReq);
     REQUEST_SIZE_MATCH(xGetFeedbackControlReq);
 
-    dev = LookupDeviceIntRec (stuff->deviceid);
-    if (dev == NULL)
-	{
-	SendErrorToClient (client, IReqCode, X_GetFeedbackControl, 0, 
-		BadDevice);
+    dev = LookupDeviceIntRec(stuff->deviceid);
+    if (dev == NULL) {
+	SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0, BadDevice);
 	return Success;
-	}
+    }
 
     rep.repType = X_Reply;
     rep.RepType = X_GetFeedbackControl;
@@ -124,73 +119,63 @@ ProcXGetFeedbackControl(ClientPtr client)
     rep.sequenceNumber = client->sequence;
     rep.num_feedbacks = 0;
 
-    for (k=dev->kbdfeed; k; k=k->next)
-	{
+    for (k = dev->kbdfeed; k; k = k->next) {
 	rep.num_feedbacks++;
 	total_length += sizeof(xKbdFeedbackState);
-	}
-    for (p=dev->ptrfeed; p; p=p->next)
-	{
+    }
+    for (p = dev->ptrfeed; p; p = p->next) {
 	rep.num_feedbacks++;
 	total_length += sizeof(xPtrFeedbackState);
-	}
-    for (s=dev->stringfeed; s; s=s->next)
-	{
+    }
+    for (s = dev->stringfeed; s; s = s->next) {
 	rep.num_feedbacks++;
-	total_length += sizeof(xStringFeedbackState) + 
-	    (s->ctrl.num_symbols_supported * sizeof (KeySym));
-	}
-    for (i=dev->intfeed; i; i=i->next)
-	{
+	total_length += sizeof(xStringFeedbackState) +
+	    (s->ctrl.num_symbols_supported * sizeof(KeySym));
+    }
+    for (i = dev->intfeed; i; i = i->next) {
 	rep.num_feedbacks++;
 	total_length += sizeof(xIntegerFeedbackState);
-	}
-    for (l=dev->leds; l; l=l->next)
-	{
+    }
+    for (l = dev->leds; l; l = l->next) {
 	rep.num_feedbacks++;
 	total_length += sizeof(xLedFeedbackState);
-	}
-    for (b=dev->bell; b; b=b->next)
-	{
+    }
+    for (b = dev->bell; b; b = b->next) {
 	rep.num_feedbacks++;
 	total_length += sizeof(xBellFeedbackState);
-	}
+    }
 
-    if (total_length == 0)
-	{
-	SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0, 
-		BadMatch);
+    if (total_length == 0) {
+	SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0, BadMatch);
 	return Success;
-	}
+    }
 
-    buf = (char *) xalloc (total_length);
-    if (!buf)
-	{
-	SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0, 
-		BadAlloc);
+    buf = (char *)xalloc(total_length);
+    if (!buf) {
+	SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0, BadAlloc);
 	return Success;
-	}
-    savbuf=buf;
-
-    for (k=dev->kbdfeed; k; k=k->next)
-	CopySwapKbdFeedback (client, k, &buf);
-    for (p=dev->ptrfeed; p; p=p->next)
-	CopySwapPtrFeedback (client, p, &buf);
-    for (s=dev->stringfeed; s; s=s->next)
-	CopySwapStringFeedback (client, s, &buf);
-    for (i=dev->intfeed; i; i=i->next)
-	CopySwapIntegerFeedback (client, i, &buf);
-    for (l=dev->leds; l; l=l->next)
-	CopySwapLedFeedback (client, l, &buf);
-    for (b=dev->bell; b; b=b->next)
-	CopySwapBellFeedback (client, b, &buf);
-
-    rep.length = (total_length+3) >> 2;
+    }
+    savbuf = buf;
+
+    for (k = dev->kbdfeed; k; k = k->next)
+	CopySwapKbdFeedback(client, k, &buf);
+    for (p = dev->ptrfeed; p; p = p->next)
+	CopySwapPtrFeedback(client, p, &buf);
+    for (s = dev->stringfeed; s; s = s->next)
+	CopySwapStringFeedback(client, s, &buf);
+    for (i = dev->intfeed; i; i = i->next)
+	CopySwapIntegerFeedback(client, i, &buf);
+    for (l = dev->leds; l; l = l->next)
+	CopySwapLedFeedback(client, l, &buf);
+    for (b = dev->bell; b; b = b->next)
+	CopySwapBellFeedback(client, b, &buf);
+
+    rep.length = (total_length + 3) >> 2;
     WriteReplyToClient(client, sizeof(xGetFeedbackControlReply), &rep);
     WriteToClient(client, total_length, savbuf);
-    xfree (savbuf);
+    xfree(savbuf);
     return Success;
-    }
+}
 
 /***********************************************************************
  *
@@ -199,15 +184,15 @@ ProcXGetFeedbackControl(ClientPtr client)
  */
 
 void
-CopySwapKbdFeedback (ClientPtr client, KbdFeedbackPtr k, char **buf)
+CopySwapKbdFeedback(ClientPtr client, KbdFeedbackPtr k, char **buf)
 {
-    int	i;
-    register char 	n;
-    xKbdFeedbackState	*k2;
+    int i;
+    register char n;
+    xKbdFeedbackState *k2;
 
-    k2 = (xKbdFeedbackState *) *buf;
+    k2 = (xKbdFeedbackState *) * buf;
     k2->class = KbdFeedbackClass;
-    k2->length = sizeof (xKbdFeedbackState);
+    k2->length = sizeof(xKbdFeedbackState);
     k2->id = k->ctrl.id;
     k2->click = k->ctrl.click;
     k2->percent = k->ctrl.bell;
@@ -215,18 +200,17 @@ CopySwapKbdFeedback (ClientPtr client, KbdFeedbackPtr k, char **buf)
     k2->duration = k->ctrl.bell_duration;
     k2->led_mask = k->ctrl.leds;
     k2->global_auto_repeat = k->ctrl.autoRepeat;
-    for (i=0; i<32; i++)
+    for (i = 0; i < 32; i++)
 	k2->auto_repeats[i] = k->ctrl.autoRepeats[i];
-    if (client->swapped)
-	{
-	swaps(&k2->length,n);
-	swaps(&k2->pitch,n);
-	swaps(&k2->duration,n);
-	swapl(&k2->led_mask,n);
-	swapl(&k2->led_values,n);
-	}
-    *buf += sizeof (xKbdFeedbackState);
+    if (client->swapped) {
+	swaps(&k2->length, n);
+	swaps(&k2->pitch, n);
+	swaps(&k2->duration, n);
+	swapl(&k2->led_mask, n);
+	swapl(&k2->led_values, n);
     }
+    *buf += sizeof(xKbdFeedbackState);
+}
 
 /***********************************************************************
  *
@@ -235,27 +219,26 @@ CopySwapKbdFeedback (ClientPtr client, KbdFeedbackPtr k, char **buf)
  */
 
 void
-CopySwapPtrFeedback (ClientPtr client, PtrFeedbackPtr p, char **buf)
+CopySwapPtrFeedback(ClientPtr client, PtrFeedbackPtr p, char **buf)
 {
-    register char 	n;
-    xPtrFeedbackState	*p2;
+    register char n;
+    xPtrFeedbackState *p2;
 
-    p2 = (xPtrFeedbackState *) *buf;
+    p2 = (xPtrFeedbackState *) * buf;
     p2->class = PtrFeedbackClass;
-    p2->length = sizeof (xPtrFeedbackState);
+    p2->length = sizeof(xPtrFeedbackState);
     p2->id = p->ctrl.id;
     p2->accelNum = p->ctrl.num;
     p2->accelDenom = p->ctrl.den;
     p2->threshold = p->ctrl.threshold;
-    if (client->swapped)
-	{
-	swaps(&p2->length,n);
-	swaps(&p2->accelNum,n);
-	swaps(&p2->accelDenom,n);
-	swaps(&p2->threshold,n);
-	}
-    *buf += sizeof (xPtrFeedbackState);
+    if (client->swapped) {
+	swaps(&p2->length, n);
+	swaps(&p2->accelNum, n);
+	swaps(&p2->accelDenom, n);
+	swaps(&p2->threshold, n);
     }
+    *buf += sizeof(xPtrFeedbackState);
+}
 
 /***********************************************************************
  *
@@ -264,27 +247,26 @@ CopySwapPtrFeedback (ClientPtr client, PtrFeedbackPtr p, char **buf)
  */
 
 void
-CopySwapIntegerFeedback (ClientPtr client, IntegerFeedbackPtr i, char **buf)
+CopySwapIntegerFeedback(ClientPtr client, IntegerFeedbackPtr i, char **buf)
 {
-    register char 		n;
-    xIntegerFeedbackState	*i2;
+    register char n;
+    xIntegerFeedbackState *i2;
 
-    i2 = (xIntegerFeedbackState *) *buf;
+    i2 = (xIntegerFeedbackState *) * buf;
     i2->class = IntegerFeedbackClass;
-    i2->length = sizeof (xIntegerFeedbackState);
+    i2->length = sizeof(xIntegerFeedbackState);
     i2->id = i->ctrl.id;
     i2->resolution = i->ctrl.resolution;
     i2->min_value = i->ctrl.min_value;
     i2->max_value = i->ctrl.max_value;
-    if (client->swapped)
-	{
-	swaps(&i2->length,n);
-	swapl(&i2->resolution,n);
-	swapl(&i2->min_value,n);
-	swapl(&i2->max_value,n);
-	}
-    *buf += sizeof (xIntegerFeedbackState);
+    if (client->swapped) {
+	swaps(&i2->length, n);
+	swapl(&i2->resolution, n);
+	swapl(&i2->min_value, n);
+	swapl(&i2->max_value, n);
     }
+    *buf += sizeof(xIntegerFeedbackState);
+}
 
 /***********************************************************************
  *
@@ -293,37 +275,35 @@ CopySwapIntegerFeedback (ClientPtr client, IntegerFeedbackPtr i, char **buf)
  */
 
 void
-CopySwapStringFeedback (ClientPtr client, StringFeedbackPtr s, char **buf)
+CopySwapStringFeedback(ClientPtr client, StringFeedbackPtr s, char **buf)
 {
     int i;
-    register char 		n;
-    xStringFeedbackState	*s2;
-    KeySym			*kptr;
+    register char n;
+    xStringFeedbackState *s2;
+    KeySym *kptr;
 
-    s2 = (xStringFeedbackState *) *buf;
+    s2 = (xStringFeedbackState *) * buf;
     s2->class = StringFeedbackClass;
-    s2->length = sizeof (xStringFeedbackState) + 
-        s->ctrl.num_symbols_supported * sizeof (KeySym);
+    s2->length = sizeof(xStringFeedbackState) +
+	s->ctrl.num_symbols_supported * sizeof(KeySym);
     s2->id = s->ctrl.id;
     s2->max_symbols = s->ctrl.max_symbols;
     s2->num_syms_supported = s->ctrl.num_symbols_supported;
-    *buf += sizeof (xStringFeedbackState);
+    *buf += sizeof(xStringFeedbackState);
     kptr = (KeySym *) (*buf);
-    for (i=0; i<s->ctrl.num_symbols_supported; i++)
-	*kptr++ = *(s->ctrl.symbols_supported+i);
-    if (client->swapped)
-	{
-	swaps(&s2->length,n);
-	swaps(&s2->max_symbols,n);
-	swaps(&s2->num_syms_supported,n);
-        kptr = (KeySym *) (*buf);
-	for (i=0; i<s->ctrl.num_symbols_supported; i++,kptr++)
-	    {
-	    swapl(kptr,n);
-	    }
+    for (i = 0; i < s->ctrl.num_symbols_supported; i++)
+	*kptr++ = *(s->ctrl.symbols_supported + i);
+    if (client->swapped) {
+	swaps(&s2->length, n);
+	swaps(&s2->max_symbols, n);
+	swaps(&s2->num_syms_supported, n);
+	kptr = (KeySym *) (*buf);
+	for (i = 0; i < s->ctrl.num_symbols_supported; i++, kptr++) {
+	    swapl(kptr, n);
 	}
-    *buf += (s->ctrl.num_symbols_supported * sizeof (KeySym));
     }
+    *buf += (s->ctrl.num_symbols_supported * sizeof(KeySym));
+}
 
 /***********************************************************************
  *
@@ -332,25 +312,24 @@ CopySwapStringFeedback (ClientPtr client, StringFeedbackPtr s, char **buf)
  */
 
 void
-CopySwapLedFeedback (ClientPtr client, LedFeedbackPtr l, char **buf)
+CopySwapLedFeedback(ClientPtr client, LedFeedbackPtr l, char **buf)
 {
-    register char 	n;
-    xLedFeedbackState	*l2;
+    register char n;
+    xLedFeedbackState *l2;
 
-    l2 = (xLedFeedbackState *) *buf;
+    l2 = (xLedFeedbackState *) * buf;
     l2->class = LedFeedbackClass;
-    l2->length = sizeof (xLedFeedbackState);
+    l2->length = sizeof(xLedFeedbackState);
     l2->id = l->ctrl.id;
     l2->led_values = l->ctrl.led_values;
     l2->led_mask = l->ctrl.led_mask;
-    if (client->swapped)
-	{
-	swaps(&l2->length,n);
-	swapl(&l2->led_values,n);
-	swapl(&l2->led_mask,n);
-	}
-    *buf += sizeof (xLedFeedbackState);
+    if (client->swapped) {
+	swaps(&l2->length, n);
+	swapl(&l2->led_values, n);
+	swapl(&l2->led_mask, n);
     }
+    *buf += sizeof(xLedFeedbackState);
+}
 
 /***********************************************************************
  *
@@ -359,26 +338,25 @@ CopySwapLedFeedback (ClientPtr client, LedFeedbackPtr l, char **buf)
  */
 
 void
-CopySwapBellFeedback (ClientPtr client, BellFeedbackPtr b, char **buf)
+CopySwapBellFeedback(ClientPtr client, BellFeedbackPtr b, char **buf)
 {
-    register char 	n;
-    xBellFeedbackState	*b2;
+    register char n;
+    xBellFeedbackState *b2;
 
-    b2 = (xBellFeedbackState *) *buf;
+    b2 = (xBellFeedbackState *) * buf;
     b2->class = BellFeedbackClass;
-    b2->length = sizeof (xBellFeedbackState);
+    b2->length = sizeof(xBellFeedbackState);
     b2->id = b->ctrl.id;
     b2->percent = b->ctrl.percent;
     b2->pitch = b->ctrl.pitch;
     b2->duration = b->ctrl.duration;
-    if (client->swapped)
-	{
-	swaps(&b2->length,n);
-	swaps(&b2->pitch,n);
-	swaps(&b2->duration,n);
-	}
-    *buf += sizeof (xBellFeedbackState);
+    if (client->swapped) {
+	swaps(&b2->length, n);
+	swaps(&b2->pitch, n);
+	swaps(&b2->duration, n);
     }
+    *buf += sizeof(xBellFeedbackState);
+}
 
 /***********************************************************************
  *
@@ -388,7 +366,8 @@ CopySwapBellFeedback (ClientPtr client, BellFeedbackPtr b, char **buf)
  */
 
 void
-SRepXGetFeedbackControl (ClientPtr client, int size, xGetFeedbackControlReply *rep)
+SRepXGetFeedbackControl(ClientPtr client, int size,
+			xGetFeedbackControlReply * rep)
 {
     register char n;
 
@@ -396,4 +375,4 @@ SRepXGetFeedbackControl (ClientPtr client, int size, xGetFeedbackControlReply *r
     swapl(&rep->length, n);
     swaps(&rep->num_feedbacks, n);
     WriteToClient(client, size, (char *)rep);
-    }
+}