From 9838b7032ea9792bec21af424c53c07078636d21 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 21 Mar 2012 12:55:09 -0700
Subject: 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>
---
 test/xtest.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'test/xtest.c')

diff --git a/test/xtest.c b/test/xtest.c
index 2ab46505f..aeca669d8 100644
--- a/test/xtest.c
+++ b/test/xtest.c
@@ -40,9 +40,14 @@
 extern DeviceIntPtr xtestpointer, xtestkeyboard;
 
 /* Needed for the screen setup, otherwise we crash during sprite initialization */
-static Bool device_cursor_init(DeviceIntPtr dev, ScreenPtr screen) { return TRUE; }
+static Bool
+device_cursor_init(DeviceIntPtr dev, ScreenPtr screen)
+{
+    return TRUE;
+}
 
-static void xtest_init_devices(void)
+static void
+xtest_init_devices(void)
 {
     ScreenRec screen;
 
@@ -68,8 +73,10 @@ static void xtest_init_devices(void)
     assert(IsXTestDevice(xtestpointer, NULL));
     assert(IsXTestDevice(xtestkeyboard, NULL));
     assert(IsXTestDevice(xtestpointer, inputInfo.pointer));
+
     assert(IsXTestDevice(xtestkeyboard, inputInfo.keyboard));
     assert(GetXTestDevice(inputInfo.pointer) == xtestpointer);
+
     assert(GetXTestDevice(inputInfo.keyboard) == xtestkeyboard);
 }
 
@@ -77,7 +84,8 @@ static void xtest_init_devices(void)
  * Each xtest devices has a property attached marking it. This property
  * cannot be changed.
  */
-static void xtest_properties(void)
+static void
+xtest_properties(void)
 {
     int rc;
     char value = 1;
@@ -93,21 +101,20 @@ static void xtest_properties(void)
     assert(prop != NULL);
 
     rc = XIChangeDeviceProperty(xtestpointer, xtest_prop,
-                                XA_INTEGER, 8, PropModeReplace, 1, &value, FALSE);
+                                XA_INTEGER, 8, PropModeReplace, 1, &value,
+                                FALSE);
     assert(rc == BadAccess);
     rc = XIChangeDeviceProperty(xtestkeyboard, xtest_prop,
-                                XA_INTEGER, 8, PropModeReplace, 1, &value, FALSE);
+                                XA_INTEGER, 8, PropModeReplace, 1, &value,
+                                FALSE);
     assert(rc == BadAccess);
 }
 
-
-
-int main(int argc, char** argv)
+int
+main(int argc, char **argv)
 {
     xtest_init_devices();
     xtest_properties();
 
     return 0;
 }
-
-
-- 
cgit v1.2.3