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>
---
 include/dixgrabs.h | 45 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

(limited to 'include/dixgrabs.h')

diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index 4dd5eae6d..eccec77f8 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -35,35 +35,30 @@ extern GrabPtr AllocGrab(void);
 extern void FreeGrab(GrabPtr grab);
 extern Bool CopyGrab(GrabPtr dst, const GrabPtr src);
 
-extern GrabPtr CreateGrab(
-	int /* client */,
-	DeviceIntPtr /* device */,
-	DeviceIntPtr /* modDevice */,
-	WindowPtr /* window */,
-        enum InputLevel /* grabtype */,
-        GrabMask * /* mask */,
-        struct _GrabParameters * /* param */,
-	int /* type */,
-	KeyCode /* keybut */,
-        WindowPtr /* confineTo */,
-        CursorPtr /* cursor */);
+extern GrabPtr CreateGrab(int /* client */ ,
+                          DeviceIntPtr /* device */ ,
+                          DeviceIntPtr /* modDevice */ ,
+                          WindowPtr /* window */ ,
+                          enum InputLevel /* grabtype */ ,
+                          GrabMask * /* mask */ ,
+                          struct _GrabParameters * /* param */ ,
+                          int /* type */ ,
+                          KeyCode /* keybut */ ,
+                          WindowPtr /* confineTo */ ,
+                          CursorPtr /* cursor */ );
 
-extern _X_EXPORT int DeletePassiveGrab(
-	pointer /* value */,
-	XID /* id */);
+extern _X_EXPORT int DeletePassiveGrab(pointer /* value */ ,
+                                       XID /* id */ );
 
-extern _X_EXPORT Bool GrabMatchesSecond(
-	GrabPtr /* pFirstGrab */,
-	GrabPtr /* pSecondGrab */,
-	Bool /*ignoreDevice*/);
+extern _X_EXPORT Bool GrabMatchesSecond(GrabPtr /* pFirstGrab */ ,
+                                        GrabPtr /* pSecondGrab */ ,
+                                        Bool /*ignoreDevice */ );
 
-extern _X_EXPORT int AddPassiveGrabToList(
-	ClientPtr /* client */,
-	GrabPtr /* pGrab */);
+extern _X_EXPORT int AddPassiveGrabToList(ClientPtr /* client */ ,
+                                          GrabPtr /* pGrab */ );
 
-extern _X_EXPORT Bool DeletePassiveGrabFromList(
-	GrabPtr /* pMinuendGrab */);
+extern _X_EXPORT Bool DeletePassiveGrabFromList(GrabPtr /* pMinuendGrab */ );
 
 extern Bool GrabIsPointerGrab(GrabPtr grab);
 extern Bool GrabIsKeyboardGrab(GrabPtr grab);
-#endif /* DIXGRABS_H */
+#endif                          /* DIXGRABS_H */
-- 
cgit v1.2.3