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, 64 insertions, 76 deletions

diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
index 1b6c47a87..3405227f0 100644
--- a/Xi/xiselectev.c
+++ b/Xi/xiselectev.c
@@ -27,7 +27,6 @@
 #include <dix-config.h>
 #endif
 
-
 #include "dixstruct.h"
 #include "windowstr.h"
 #include "exglobals.h"
@@ -43,15 +42,14 @@
  *
  * @return BadValue if at least one invalid bit is set or Success otherwise.
  */
-int XICheckInvalidMaskBits(ClientPtr client, unsigned char *mask, int len)
+int
+XICheckInvalidMaskBits(ClientPtr client, unsigned char *mask, int len)
 {
-    if (len >= XIMaskLen(XI2LASTEVENT))
-    {
+    if (len >= XIMaskLen(XI2LASTEVENT)) {
         int i;
-        for (i = XI2LASTEVENT + 1; i < len * 8; i++)
-        {
-            if (BitIsOn(mask, i))
-            {
+
+        for (i = XI2LASTEVENT + 1; i < len * 8; i++) {
+            if (BitIsOn(mask, i)) {
                 client->errorValue = i;
                 return BadValue;
             }
@@ -65,7 +63,7 @@ int
 SProcXISelectEvents(ClientPtr client)
 {
     int i;
-    xXIEventMask* evmask;
+    xXIEventMask *evmask;
 
     REQUEST(xXISelectEventsReq);
     swaps(&stuff->length);
@@ -73,12 +71,12 @@ SProcXISelectEvents(ClientPtr client)
     swapl(&stuff->win);
     swaps(&stuff->num_masks);
 
-    evmask = (xXIEventMask*)&stuff[1];
-    for (i = 0; i < stuff->num_masks; i++)
-    {
+    evmask = (xXIEventMask *) & stuff[1];
+    for (i = 0; i < stuff->num_masks; i++) {
         swaps(&evmask->deviceid);
         swaps(&evmask->mask_len);
-        evmask = (xXIEventMask*)(((char*)&evmask[1]) + evmask->mask_len * 4);
+        evmask =
+            (xXIEventMask *) (((char *) &evmask[1]) + evmask->mask_len * 4);
     }
 
     return (ProcXISelectEvents(client));
@@ -108,10 +106,9 @@ ProcXISelectEvents(ClientPtr client)
     len = sz_xXISelectEventsReq;
 
     /* check request validity */
-    evmask = (xXIEventMask*)&stuff[1];
+    evmask = (xXIEventMask *) & stuff[1];
     num_masks = stuff->num_masks;
-    while(num_masks--)
-    {
+    while (num_masks--) {
         len += sizeof(xXIEventMask) + evmask->mask_len * 4;
 
         if (bytes_to_int32(len) > stuff->length)
@@ -127,20 +124,19 @@ ProcXISelectEvents(ClientPtr client)
             return rc;
 
         /* hierarchy event mask is not allowed on devices */
-        if (evmask->deviceid != XIAllDevices && evmask->mask_len >= 1)
-        {
-            unsigned char *bits = (unsigned char*)&evmask[1];
-            if (BitIsOn(bits, XI_HierarchyChanged))
-            {
+        if (evmask->deviceid != XIAllDevices && evmask->mask_len >= 1) {
+            unsigned char *bits = (unsigned char *) &evmask[1];
+
+            if (BitIsOn(bits, XI_HierarchyChanged)) {
                 client->errorValue = XI_HierarchyChanged;
                 return BadValue;
             }
         }
 
         /* Raw events may only be selected on root windows */
-        if (win->parent && evmask->mask_len >= 1)
-        {
-            unsigned char *bits = (unsigned char*)&evmask[1];
+        if (win->parent && evmask->mask_len >= 1) {
+            unsigned char *bits = (unsigned char *) &evmask[1];
+
             if (BitIsOn(bits, XI_RawKeyPress) ||
                 BitIsOn(bits, XI_RawKeyRelease) ||
                 BitIsOn(bits, XI_RawButtonPress) ||
@@ -148,16 +144,14 @@ ProcXISelectEvents(ClientPtr client)
                 BitIsOn(bits, XI_RawMotion) ||
                 BitIsOn(bits, XI_RawTouchBegin) ||
                 BitIsOn(bits, XI_RawTouchUpdate) ||
-                BitIsOn(bits, XI_RawTouchEnd))
-            {
+                BitIsOn(bits, XI_RawTouchEnd)) {
                 client->errorValue = XI_RawKeyPress;
                 return BadValue;
             }
         }
 
-        if (evmask->mask_len >= 1)
-        {
-            unsigned char *bits = (unsigned char*)&evmask[1];
+        if (evmask->mask_len >= 1) {
+            unsigned char *bits = (unsigned char *) &evmask[1];
 
             /* All three touch events must be selected at once */
             if ((BitIsOn(bits, XI_TouchBegin) ||
@@ -166,8 +160,7 @@ ProcXISelectEvents(ClientPtr client)
                  BitIsOn(bits, XI_TouchEnd)) &&
                 (!BitIsOn(bits, XI_TouchBegin) ||
                  !BitIsOn(bits, XI_TouchUpdate) ||
-                 !BitIsOn(bits, XI_TouchEnd)))
-            {
+                 !BitIsOn(bits, XI_TouchEnd))) {
                 client->errorValue = XI_TouchBegin;
                 return BadValue;
             }
@@ -175,22 +168,22 @@ ProcXISelectEvents(ClientPtr client)
             /* Only one client per window may select for touch events on the
              * same devices, including master devices.
              * XXX: This breaks if a device goes from floating to attached. */
-            if (BitIsOn(bits, XI_TouchBegin))
-            {
+            if (BitIsOn(bits, XI_TouchBegin)) {
                 OtherInputMasks *inputMasks = wOtherInputMasks(win);
                 InputClients *iclient = NULL;
+
                 if (inputMasks)
                     iclient = inputMasks->inputClients;
-                for (; iclient; iclient = iclient->next)
-                {
+                for (; iclient; iclient = iclient->next) {
                     DeviceIntPtr dummy;
 
                     if (CLIENT_ID(iclient->resource) == client->index)
                         continue;
 
-                    dixLookupDevice(&dummy, evmask->deviceid, serverClient, DixReadAccess);
+                    dixLookupDevice(&dummy, evmask->deviceid, serverClient,
+                                    DixReadAccess);
                     if (!dummy)
-                        return BadImplementation; /* this shouldn't happen */
+                        return BadImplementation;       /* this shouldn't happen */
 
                     if (xi2mask_isset(iclient->xi2mask, dummy, XI_TouchBegin))
                         return BadAccess;
@@ -198,11 +191,13 @@ ProcXISelectEvents(ClientPtr client)
             }
         }
 
-        if (XICheckInvalidMaskBits(client, (unsigned char*)&evmask[1],
+        if (XICheckInvalidMaskBits(client, (unsigned char *) &evmask[1],
                                    evmask->mask_len * 4) != Success)
             return BadValue;
 
-        evmask = (xXIEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4);
+        evmask =
+            (xXIEventMask *) (((unsigned char *) evmask) +
+                              evmask->mask_len * 4);
         evmask++;
     }
 
@@ -210,21 +205,22 @@ ProcXISelectEvents(ClientPtr client)
         return BadLength;
 
     /* Set masks on window */
-    evmask = (xXIEventMask*)&stuff[1];
+    evmask = (xXIEventMask *) & stuff[1];
     num_masks = stuff->num_masks;
-    while(num_masks--)
-    {
+    while (num_masks--) {
         if (evmask->deviceid == XIAllDevices ||
-            evmask->deviceid == XIAllMasterDevices)
-        {
+            evmask->deviceid == XIAllMasterDevices) {
             dummy.id = evmask->deviceid;
             dev = &dummy;
-        } else
+        }
+        else
             dixLookupDevice(&dev, evmask->deviceid, client, DixUseAccess);
         if (XISetEventMask(dev, win, client, evmask->mask_len * 4,
-                           (unsigned char*)&evmask[1]) != Success)
+                           (unsigned char *) &evmask[1]) != Success)
             return BadAlloc;
-        evmask = (xXIEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4);
+        evmask =
+            (xXIEventMask *) (((unsigned char *) evmask) +
+                              evmask->mask_len * 4);
         evmask++;
     }
 
@@ -234,7 +230,6 @@ ProcXISelectEvents(ClientPtr client)
     return Success;
 }
 
-
 int
 SProcXIGetSelectedEvents(ClientPtr client)
 {
@@ -272,59 +267,53 @@ ProcXIGetSelectedEvents(ClientPtr client)
     reply.num_masks = 0;
 
     masks = wOtherInputMasks(win);
-    if (masks)
-    {
-	for (others = wOtherInputMasks(win)->inputClients; others;
-	     others = others->next) {
-	    if (SameClient(others, client)) {
+    if (masks) {
+        for (others = wOtherInputMasks(win)->inputClients; others;
+             others = others->next) {
+            if (SameClient(others, client)) {
                 break;
             }
         }
     }
 
-    if (!others)
-    {
+    if (!others) {
         WriteReplyToClient(client, sizeof(xXIGetSelectedEventsReply), &reply);
         return Success;
     }
 
-    buffer = calloc(MAXDEVICES, sizeof(xXIEventMask) + pad_to_int32(XI2MASKSIZE));
+    buffer =
+        calloc(MAXDEVICES, sizeof(xXIEventMask) + pad_to_int32(XI2MASKSIZE));
     if (!buffer)
         return BadAlloc;
 
-    evmask = (xXIEventMask*)buffer;
-    for (i = 0; i < MAXDEVICES; i++)
-    {
+    evmask = (xXIEventMask *) buffer;
+    for (i = 0; i < MAXDEVICES; i++) {
         int j;
         const unsigned char *devmask = xi2mask_get_one_mask(others->xi2mask, i);
 
-        if (i > 2)
-        {
+        if (i > 2) {
             rc = dixLookupDevice(&dev, i, client, DixGetAttrAccess);
             if (rc != Success)
                 continue;
         }
 
+        for (j = xi2mask_mask_size(others->xi2mask) - 1; j >= 0; j--) {
+            if (devmask[j] != 0) {
+                int mask_len = (j + 4) / 4;     /* j is an index, hence + 4, not + 3 */
 
-        for (j = xi2mask_mask_size(others->xi2mask) - 1; j >= 0; j--)
-        {
-            if (devmask[j] != 0)
-            {
-                int mask_len = (j + 4)/4; /* j is an index, hence + 4, not + 3 */
                 evmask->deviceid = i;
                 evmask->mask_len = mask_len;
                 reply.num_masks++;
-                reply.length += sizeof(xXIEventMask)/4 + evmask->mask_len;
+                reply.length += sizeof(xXIEventMask) / 4 + evmask->mask_len;
 
-                if (client->swapped)
-                {
+                if (client->swapped) {
                     swaps(&evmask->deviceid);
                     swaps(&evmask->mask_len);
                 }
 
                 memcpy(&evmask[1], devmask, j + 1);
-                evmask = (xXIEventMask*)((char*)evmask +
-                           sizeof(xXIEventMask) + mask_len * 4);
+                evmask = (xXIEventMask *) ((char *) evmask +
+                                           sizeof(xXIEventMask) + mask_len * 4);
                 break;
             }
         }
@@ -339,13 +328,12 @@ ProcXIGetSelectedEvents(ClientPtr client)
     return Success;
 }
 
-void SRepXIGetSelectedEvents(ClientPtr client,
-                            int len, xXIGetSelectedEventsReply *rep)
+void
+SRepXIGetSelectedEvents(ClientPtr client,
+                        int len, xXIGetSelectedEventsReply * rep)
 {
     swaps(&rep->sequenceNumber);
     swapl(&rep->length);
     swaps(&rep->num_masks);
-    WriteToClient(client, len, (char *)rep);
+    WriteToClient(client, len, (char *) rep);
 }
-
-