Mass reindent. Sorry.XORG-7_0_99_901

1 files changed, 104 insertions, 108 deletions

diff --git a/src/XQueryDv.c b/src/XQueryDv.c
index 1450c15..94d0f9a 100644
--- a/src/XQueryDv.c
+++ b/src/XQueryDv.c
@@ -60,139 +60,135 @@ SOFTWARE.
 #include <X11/extensions/extutil.h>
 #include "XIint.h"
 
-XDeviceState
-*XQueryDeviceState (dpy, dev)
-    register Display *dpy;
-    XDevice *dev;
-    {       
-    int				i,j;
-    int				rlen;
-    int				size = 0;
-    xQueryDeviceStateReq 	*req;
-    xQueryDeviceStateReply 	rep;
-    XDeviceState		*state = NULL;
-    XInputClass			*any, *Any;
-    char			*data;
-    XExtDisplayInfo *info = XInput_find_display (dpy);
-
-    LockDisplay (dpy);
+XDeviceState * XQueryDeviceState(dpy, dev)
+    register Display *
+	dpy;
+    XDevice *
+	dev;
+{
+    int i, j;
+    int rlen;
+    int size = 0;
+    xQueryDeviceStateReq *req;
+    xQueryDeviceStateReply rep;
+    XDeviceState *state = NULL;
+    XInputClass *any, *Any;
+    char *data;
+    XExtDisplayInfo *info = XInput_find_display(dpy);
+
+    LockDisplay(dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)
 	return ((XDeviceState *) NoSuchExtension);
 
-    GetReq(QueryDeviceState,req);		
+    GetReq(QueryDeviceState, req);
     req->reqType = info->codes->major_opcode;
     req->ReqType = X_QueryDeviceState;
     req->deviceid = dev->device_id;
 
-    if (! _XReply (dpy, (xReply *) &rep, 0, xFalse)) 
-	{
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
 	UnlockDisplay(dpy);
 	SyncHandle();
 	return (XDeviceState *) NULL;
-	}
+    }
 
     rlen = rep.length << 2;
-    if (rlen > 0)
-	{
-	data = Xmalloc (rlen);
-	if (!data)
-	    {
-	    _XEatData (dpy, (unsigned long) rlen);
-    	    UnlockDisplay(dpy);
-    	    SyncHandle();
-    	    return ((XDeviceState *) NULL);
-	    }
-	_XRead (dpy, data, rlen);
-
-	for (i=0, any=(XInputClass *) data; i<(int)rep.num_classes; i++)
+    if (rlen > 0) {
+	data = Xmalloc(rlen);
+	if (!data) {
+	    _XEatData(dpy, (unsigned long)rlen);
+	    UnlockDisplay(dpy);
+	    SyncHandle();
+	    return ((XDeviceState *) NULL);
+	}
+	_XRead(dpy, data, rlen);
+
+	for (i = 0, any = (XInputClass *) data; i < (int)rep.num_classes; i++) {
+	    switch (any->class) {
+	    case KeyClass:
+		size += sizeof(XKeyState);
+		break;
+	    case ButtonClass:
+		size += sizeof(XButtonState);
+		break;
+	    case ValuatorClass:
 	    {
-	    switch (any->class)
-		{
-		case KeyClass:
-		    size += sizeof (XKeyState);
-		    break;
-		case ButtonClass:
-		    size += sizeof (XButtonState);
-		    break;
-		case ValuatorClass:
-		    {
-		    xValuatorState *v = (xValuatorState *) any;
-		    size += (sizeof (XValuatorState) + 
-			(v->num_valuators * sizeof(int)));
-		    }
-		    break;
-		}
-	    any = (XInputClass *) ((char *) any + any->length);
+		xValuatorState *v = (xValuatorState *) any;
+		size += (sizeof(XValuatorState) +
+			 (v->num_valuators * sizeof(int)));
 	    }
-	state = (XDeviceState *) Xmalloc (size + sizeof(XDeviceState));
-	if (!state)
-	    {
-    	    UnlockDisplay(dpy);
-    	    SyncHandle();
-    	    return ((XDeviceState *) NULL);
+		break;
 	    }
+	    any = (XInputClass *) ((char *)any + any->length);
+	}
+	state = (XDeviceState *) Xmalloc(size + sizeof(XDeviceState));
+	if (!state) {
+	    UnlockDisplay(dpy);
+	    SyncHandle();
+	    return ((XDeviceState *) NULL);
+	}
 	state->device_id = dev->device_id;
 	state->num_classes = rep.num_classes;
 	state->data = (XInputClass *) (state + 1);
 
-	Any = state->data; 
-	for (i=0, any=(XInputClass *) data; i<(int)rep.num_classes; i++)
+	Any = state->data;
+	for (i = 0, any = (XInputClass *) data; i < (int)rep.num_classes; i++) {
+	    switch (any->class) {
+	    case KeyClass:
 	    {
-	    switch (any->class)
-		{
-		case KeyClass:
-		    {
-		    xKeyState *k = (xKeyState *) any;
-		    XKeyState *K = (XKeyState *) Any;
-		    K->class = k->class;
-		    K->length = sizeof (XKeyState);
-		    K->num_keys = k->num_keys;
-		    memcpy ((char *) &K->keys[0], (char *) &k->keys[0], 32);
-		    Any = (XInputClass *) (K+1);
-		    }
-		    break;
-		case ButtonClass:
-		    {
-		    xButtonState *b = (xButtonState *) any;
-		    XButtonState *B = (XButtonState *) Any;
-		    B->class = b->class;
-		    B->length = sizeof (XButtonState);
-		    B->num_buttons = b->num_buttons;
-		    memcpy ((char *) &B->buttons[0], (char *) &b->buttons[0],
-			    32);
-		    Any = (XInputClass *) (B+1);
-		    }
-		    break;
-		case ValuatorClass:
-		    {
-		    xValuatorState *v = (xValuatorState *) any;
-		    XValuatorState *V = (XValuatorState *) Any;
-		    CARD32 *valuators = (CARD32 *) (v+1);
-		    V->class = v->class;
-		    V->length = sizeof (XValuatorState);
-		    V->num_valuators = v->num_valuators;
-		    V->mode = v->mode;
-		    Any = (XInputClass *) (V+1);
-		    V->valuators = (int *) Any;
-		    for (j=0; j<(int)V->num_valuators; j++)
-			*(V->valuators + j) = *valuators++;
-		    Any = (XInputClass *)((char *) Any + 
-			V->num_valuators * sizeof (int));
-		    }
-		    break;
-		}
-	    any = (XInputClass *) ((char *) any + any->length);
+		xKeyState *k = (xKeyState *) any;
+		XKeyState *K = (XKeyState *) Any;
+
+		K->class = k->class;
+		K->length = sizeof(XKeyState);
+		K->num_keys = k->num_keys;
+		memcpy((char *)&K->keys[0], (char *)&k->keys[0], 32);
+		Any = (XInputClass *) (K + 1);
 	    }
-	Xfree(data);
+		break;
+	    case ButtonClass:
+	    {
+		xButtonState *b = (xButtonState *) any;
+		XButtonState *B = (XButtonState *) Any;
+
+		B->class = b->class;
+		B->length = sizeof(XButtonState);
+		B->num_buttons = b->num_buttons;
+		memcpy((char *)&B->buttons[0], (char *)&b->buttons[0], 32);
+		Any = (XInputClass *) (B + 1);
+	    }
+		break;
+	    case ValuatorClass:
+	    {
+		xValuatorState *v = (xValuatorState *) any;
+		XValuatorState *V = (XValuatorState *) Any;
+		CARD32 *valuators = (CARD32 *) (v + 1);
+
+		V->class = v->class;
+		V->length = sizeof(XValuatorState);
+		V->num_valuators = v->num_valuators;
+		V->mode = v->mode;
+		Any = (XInputClass *) (V + 1);
+		V->valuators = (int *)Any;
+		for (j = 0; j < (int)V->num_valuators; j++)
+		    *(V->valuators + j) = *valuators++;
+		Any = (XInputClass *) ((char *)Any +
+				       V->num_valuators * sizeof(int));
+	    }
+		break;
+	    }
+	    any = (XInputClass *) ((char *)any + any->length);
 	}
+	Xfree(data);
+    }
 
     UnlockDisplay(dpy);
     SyncHandle();
     return (state);
-    }
+}
 
-void XFreeDeviceState (list)
+void
+XFreeDeviceState(list)
     XDeviceState *list;
-    {
-    XFree ((char *)list);
-    }
+{
+    XFree((char *)list);
+}