Introduce a consistent coding style

This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:

	-bap
	-psl
	-T PrivatePtr
	-T pmWait
	-T _XFUNCPROTOBEGIN
	-T _XFUNCPROTOEND
	-T _X_EXPORT

The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.

The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.

The comparison was done with this script:

dir1=$1
dir2=$2

for dir in $dir1 $dir2; do
	(cd $dir && find . -name '*.o' | while read file; do
		dir=`dirname $file`
		base=`basename $file .o`
		dump=$dir/$base.dump
		objdump -d $file > $dump
	done)
done

find $dir1 -name '*.dump' | while read dump; do
	otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
	diff -u $dump $otherdump
done

Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 47 insertions, 46 deletions

diff --git a/Xi/queryst.c b/Xi/queryst.c
index 8c3bdcf97..ffb6de04a 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -36,8 +36,8 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include "inputstr.h"	/* DeviceIntPtr      */
-#include "windowstr.h"	/* window structure  */
+#include "inputstr.h"           /* DeviceIntPtr      */
+#include "windowstr.h"          /* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "exevents.h"
@@ -94,79 +94,80 @@ ProcXQueryDeviceState(ClientPtr client)
 
     rc = dixLookupDevice(&dev, stuff->deviceid, client, DixReadAccess);
     if (rc != Success && rc != BadAccess)
-	return rc;
+        return rc;
 
     v = dev->valuator;
     if (v != NULL && v->motionHintWindow != NULL)
-	MaybeStopDeviceHint(dev, client);
+        MaybeStopDeviceHint(dev, client);
 
     k = dev->key;
     if (k != NULL) {
-	total_length += sizeof(xKeyState);
-	num_classes++;
+        total_length += sizeof(xKeyState);
+        num_classes++;
     }
 
     b = dev->button;
     if (b != NULL) {
-	total_length += sizeof(xButtonState);
-	num_classes++;
+        total_length += sizeof(xButtonState);
+        num_classes++;
     }
 
     if (v != NULL) {
-	total_length += (sizeof(xValuatorState) + (v->numAxes * sizeof(int)));
-	num_classes++;
+        total_length += (sizeof(xValuatorState) + (v->numAxes * sizeof(int)));
+        num_classes++;
     }
-    buf = (char *)calloc(total_length, 1);
+    buf = (char *) calloc(total_length, 1);
     if (!buf)
-	return BadAlloc;
+        return BadAlloc;
     savbuf = buf;
 
     if (k != NULL) {
-	tk = (xKeyState *) buf;
-	tk->class = KeyClass;
-	tk->length = sizeof(xKeyState);
-	tk->num_keys = k->xkbInfo->desc->max_key_code -
-                       k->xkbInfo->desc->min_key_code + 1;
-	if (rc != BadAccess)
-	    for (i = 0; i < 32; i++)
-		tk->keys[i] = k->down[i];
-	buf += sizeof(xKeyState);
+        tk = (xKeyState *) buf;
+        tk->class = KeyClass;
+        tk->length = sizeof(xKeyState);
+        tk->num_keys = k->xkbInfo->desc->max_key_code -
+            k->xkbInfo->desc->min_key_code + 1;
+        if (rc != BadAccess)
+            for (i = 0; i < 32; i++)
+                tk->keys[i] = k->down[i];
+        buf += sizeof(xKeyState);
     }
 
     if (b != NULL) {
-	tb = (xButtonState *) buf;
-	tb->class = ButtonClass;
-	tb->length = sizeof(xButtonState);
-	tb->num_buttons = b->numButtons;
-	if (rc != BadAccess)
-	    memcpy(tb->buttons, b->down, sizeof(b->down));
-	buf += sizeof(xButtonState);
+        tb = (xButtonState *) buf;
+        tb->class = ButtonClass;
+        tb->length = sizeof(xButtonState);
+        tb->num_buttons = b->numButtons;
+        if (rc != BadAccess)
+            memcpy(tb->buttons, b->down, sizeof(b->down));
+        buf += sizeof(xButtonState);
     }
 
     if (v != NULL) {
-	tv = (xValuatorState *) buf;
-	tv->class = ValuatorClass;
-	tv->length = sizeof(xValuatorState) + v->numAxes * 4;
-	tv->num_valuators = v->numAxes;
-	tv->mode = valuator_get_mode(dev, 0);
-	tv->mode |= (dev->proximity && !dev->proximity->in_proximity) ? OutOfProximity : 0;
-	buf += sizeof(xValuatorState);
-	for (i = 0, values = v->axisVal; i < v->numAxes; i++) {
-	    if (rc != BadAccess)
-		*((int *)buf) = *values;
-	    values++;
-	    if (client->swapped) {
-		swapl((int *)buf);
-	    }
-	    buf += sizeof(int);
-	}
+        tv = (xValuatorState *) buf;
+        tv->class = ValuatorClass;
+        tv->length = sizeof(xValuatorState) + v->numAxes * 4;
+        tv->num_valuators = v->numAxes;
+        tv->mode = valuator_get_mode(dev, 0);
+        tv->mode |= (dev->proximity &&
+                     !dev->proximity->in_proximity) ? OutOfProximity : 0;
+        buf += sizeof(xValuatorState);
+        for (i = 0, values = v->axisVal; i < v->numAxes; i++) {
+            if (rc != BadAccess)
+                *((int *) buf) = *values;
+            values++;
+            if (client->swapped) {
+                swapl((int *) buf);
+            }
+            buf += sizeof(int);
+        }
     }
 
     rep.num_classes = num_classes;
     rep.length = bytes_to_int32(total_length);
     WriteReplyToClient(client, sizeof(xQueryDeviceStateReply), &rep);
     if (total_length > 0)
-	WriteToClient(client, total_length, savbuf);
+        WriteToClient(client, total_length, savbuf);
     free(savbuf);
     return Success;
 }
@@ -183,5 +184,5 @@ SRepXQueryDeviceState(ClientPtr client, int size, xQueryDeviceStateReply * rep)
 {
     swaps(&rep->sequenceNumber);
     swapl(&rep->length);
-    WriteToClient(client, size, (char *)rep);
+    WriteToClient(client, size, (char *) rep);
 }