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, 17 insertions, 13 deletions

diff --git a/test/touch.c b/test/touch.c
index 88955cbc1..2ec535b43 100644
--- a/test/touch.c
+++ b/test/touch.c
@@ -30,7 +30,8 @@
 #include "assert.h"
 #include "scrnintstr.h"
 
-static void touch_grow_queue(void)
+static void
+touch_grow_queue(void)
 {
     DeviceIntRec dev;
     ValuatorClassRec val;
@@ -60,12 +61,13 @@ static void touch_grow_queue(void)
     assert(TouchBeginDDXTouch(&dev, 1234) == NULL);
     ProcessWorkQueue();
 
-    new_size = size + size/2 + 1;
+    new_size = size + size / 2 + 1;
     assert(dev.last.num_touches == new_size);
 
     /* make sure we haven't touched those */
     for (i = 0; i < size; i++) {
         DDXTouchPointInfoPtr t = &dev.last.touches[i];
+
         assert(t->active == TRUE);
         assert(t->ddx_id == i);
         assert(t->client_id == i * 2);
@@ -74,13 +76,15 @@ static void touch_grow_queue(void)
     /* make sure those are zero-initialized */
     for (i = size; i < new_size; i++) {
         DDXTouchPointInfoPtr t = &dev.last.touches[i];
+
         assert(t->active == FALSE);
         assert(t->client_id == 0);
         assert(t->ddx_id == 0);
     }
 }
 
-static void touch_find_ddxid(void)
+static void
+touch_find_ddxid(void)
 {
     DeviceIntRec dev;
     DDXTouchPointInfoPtr ti;
@@ -99,12 +103,10 @@ static void touch_find_ddxid(void)
     inputInfo.devices = &dev;
     assert(dev.last.touches);
 
-
     dev.last.touches[0].active = TRUE;
     dev.last.touches[0].ddx_id = 10;
     dev.last.touches[0].client_id = 20;
 
-
     /* existing */
     ti = TouchFindByDDXID(&dev, 10, FALSE);
     assert(ti == &dev.last.touches[0]);
@@ -118,7 +120,7 @@ static void touch_find_ddxid(void)
     ti = TouchFindByDDXID(&dev, 10, FALSE);
     assert(ti == NULL);
 
-    /* create on number 2*/
+    /* create on number 2 */
     dev.last.touches[0].active = TRUE;
 
     ti = TouchFindByDDXID(&dev, 20, TRUE);
@@ -148,7 +150,8 @@ static void touch_find_ddxid(void)
     assert(ti == &dev.last.touches[size]);
 }
 
-static void touch_begin_ddxtouch(void)
+static void
+touch_begin_ddxtouch(void)
 {
     DeviceIntRec dev;
     DDXTouchPointInfoPtr ti;
@@ -191,7 +194,8 @@ static void touch_begin_ddxtouch(void)
     last_client_id = ti->client_id;
 }
 
-static void touch_begin_touch(void)
+static void
+touch_begin_touch(void)
 {
     DeviceIntRec dev;
     TouchClassRec touch;
@@ -231,10 +235,11 @@ static void touch_begin_touch(void)
     assert(touch.num_touches == 1);
 }
 
-static void touch_init(void)
+static void
+touch_init(void)
 {
     DeviceIntRec dev;
-    Atom labels[2] = {0};
+    Atom labels[2] = { 0 };
     int rc;
     SpriteInfoRec sprite;
     ScreenRec screen;
@@ -256,9 +261,8 @@ static void touch_init(void)
     assert(dev.touch);
 }
 
-
-
-int main(int argc, char** argv)
+int
+main(int argc, char **argv)
 {
     touch_grow_queue();
     touch_find_ddxid();