Xi: reformat code, ansify

1 files changed, 31 insertions, 31 deletions

diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c
index b721d72ee..9dd00ce25 100644
--- a/nx-X11/programs/Xserver/Xi/sendexev.c
+++ b/nx-X11/programs/Xserver/Xi/sendexev.c
@@ -70,7 +70,7 @@ SOFTWARE.
 #include "grabdev.h"
 #include "sendexev.h"
 
-extern int 		lastEvent; 		/* Defined in extension.c */
+extern int lastEvent;	/* Defined in extension.c */
 
 /***********************************************************************
  *
@@ -81,7 +81,7 @@ extern int 		lastEvent; 		/* Defined in extension.c */
 int
 SProcXSendExtensionEvent(client)
     register ClientPtr client;
-    {
+{
     CARD32 *p;
     register int i;
     xEvent eventT;
@@ -95,23 +95,23 @@ SProcXSendExtensionEvent(client)
     swaps(&stuff->count);
 
     if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count +
-       (stuff->num_events * (sizeof(xEvent) >> 2)))
-       return BadLength;
+	(stuff->num_events * (sizeof(xEvent) >> 2)))
+	return BadLength;
 
-    eventP = (xEvent *) &stuff[1];
+    eventP = (xEvent *) & stuff[1];
     for (i=0; i<stuff->num_events; i++,eventP++)
         {
 	proc = EventSwapVector[eventP->u.u.type & 0177];
- 	if (proc == NotImplemented)   /* no swapping proc; invalid event type? */
+	if (proc == NotImplemented)	/* no swapping proc; invalid event type? */
 	    return (BadValue);
-	(*proc)(eventP, &eventT);
+	(*proc) (eventP, &eventT);
 	*eventP = eventT;
-	}
+    }
 
-    p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events);
+    p = (CARD32 *) (((xEvent *) & stuff[1]) + stuff->num_events);
     SwapLongs(p, stuff->count);
-    return(ProcXSendExtensionEvent(client));
-    }
+    return (ProcXSendExtensionEvent(client));
+}
 
 /***********************************************************************
  *
@@ -123,59 +123,59 @@ SProcXSendExtensionEvent(client)
 int
 ProcXSendExtensionEvent (client)
     register ClientPtr client;
-    {
-    int			ret;
-    DeviceIntPtr	dev;
-    xEvent		*first;
-    XEventClass		*list;
-    struct tmask	tmp[EMASKSIZE];
+{
+    int ret;
+    DeviceIntPtr dev;
+    xEvent *first;
+    XEventClass *list;
+    struct tmask tmp[EMASKSIZE];
 
     REQUEST(xSendExtensionEventReq);
     REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq);
 
-    if (stuff->length !=(sizeof(xSendExtensionEventReq)>>2) + stuff->count +
+    if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count +
 	(stuff->num_events * (sizeof (xEvent) >> 2)))
 	{
 	SendErrorToClient (client, IReqCode, X_SendExtensionEvent, 0, 
 		BadLength);
 	return Success;
-	}
+    }
 
-    dev = LookupDeviceIntRec (stuff->deviceid);
+    dev = LookupDeviceIntRec(stuff->deviceid);
     if (dev == NULL)
 	{
 	SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, 
 		BadDevice);
 	return Success;
-	}
+    }
 
     /*
        the previous code here returned the unitialized variable ret,
        so using Success we have defined returncode at least. FIXME:
        Upstream works different here, we must check this!
-    */
+     */
     if (stuff->num_events == 0)
-        /* return ret; */
-        return Success;
+	/* return ret; */
+	return Success;
 
     /* The client's event type must be one defined by an extension. */
 
-    first = ((xEvent *) &stuff[1]);
-    if ( ! ((EXTENSION_EVENT_BASE  <= first->u.u.type) &&
+    first = ((xEvent *) & stuff[1]);
+    if (!((EXTENSION_EVENT_BASE <= first->u.u.type) &&
 	(first->u.u.type < lastEvent)) )
 	{
 	client->errorValue = first->u.u.type;
 	SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, 
 		BadValue);
 	return Success;
-	}
+    }
 
     list = (XEventClass *) (first + stuff->num_events);
-    if ((ret = CreateMaskFromList (client, list, stuff->count, tmp, dev, 
-	X_SendExtensionEvent)) != Success)
+    if ((ret = CreateMaskFromList(client, list, stuff->count, tmp, dev,
+			    X_SendExtensionEvent)) != Success)
 	return Success;
 
-    ret =  (SendEvent (client, dev, stuff->destination,
+    ret = (SendEvent(client, dev, stuff->destination,
 	stuff->propagate, (xEvent *)&stuff[1], tmp[stuff->deviceid].mask, 
 	stuff->num_events));
 
@@ -183,4 +183,4 @@ ProcXSendExtensionEvent (client)
 	SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, ret);
 
     return Success;
-    }
+}