From 8384075e1a0fb3189f9c37c17f9e12e1aae5102c 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>
(cherry picked from commit 9838b7032ea9792bec21af424c53c07078636d21)
---
 Xi/xiproperty.h | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

(limited to 'Xi/xiproperty.h')

diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h
index d8b886379..482c834ed 100644
--- a/Xi/xiproperty.h
+++ b/Xi/xiproperty.h
@@ -30,39 +30,38 @@
 #ifndef XIPROPERTY_H
 #define XIPROPERTY_H 1
 
-int ProcXListDeviceProperties     (ClientPtr client);
-int ProcXChangeDeviceProperty     (ClientPtr client);
-int ProcXDeleteDeviceProperty     (ClientPtr client);
-int ProcXGetDeviceProperty        (ClientPtr client);
+int ProcXListDeviceProperties(ClientPtr client);
+int ProcXChangeDeviceProperty(ClientPtr client);
+int ProcXDeleteDeviceProperty(ClientPtr client);
+int ProcXGetDeviceProperty(ClientPtr client);
 
 /* request swapping */
-int SProcXListDeviceProperties    (ClientPtr client);
-int SProcXChangeDeviceProperty    (ClientPtr client);
-int SProcXDeleteDeviceProperty    (ClientPtr client);
-int SProcXGetDeviceProperty       (ClientPtr client);
+int SProcXListDeviceProperties(ClientPtr client);
+int SProcXChangeDeviceProperty(ClientPtr client);
+int SProcXDeleteDeviceProperty(ClientPtr client);
+int SProcXGetDeviceProperty(ClientPtr client);
 
 /* reply swapping */
 void SRepXListDeviceProperties(ClientPtr client, int size,
-                               xListDevicePropertiesReply *rep);
+                               xListDevicePropertiesReply * rep);
 void SRepXGetDeviceProperty(ClientPtr client, int size,
-                            xGetDevicePropertyReply *rep);
+                            xGetDevicePropertyReply * rep);
 
 /* XI2 request/reply handling  */
-int ProcXIListProperties        (ClientPtr client);
-int ProcXIChangeProperty        (ClientPtr client);
-int ProcXIDeleteProperty        (ClientPtr client);
-int ProcXIGetProperty           (ClientPtr client);
+int ProcXIListProperties(ClientPtr client);
+int ProcXIChangeProperty(ClientPtr client);
+int ProcXIDeleteProperty(ClientPtr client);
+int ProcXIGetProperty(ClientPtr client);
 
-int SProcXIListProperties       (ClientPtr client);
-int SProcXIChangeProperty       (ClientPtr client);
-int SProcXIDeleteProperty       (ClientPtr client);
-int SProcXIGetProperty          (ClientPtr client);
+int SProcXIListProperties(ClientPtr client);
+int SProcXIChangeProperty(ClientPtr client);
+int SProcXIDeleteProperty(ClientPtr client);
+int SProcXIGetProperty(ClientPtr client);
 
 void SRepXIListProperties(ClientPtr client, int size,
-                          xXIListPropertiesReply *rep);
-void SRepXIGetProperty(ClientPtr client, int size,
-                       xXIGetPropertyReply *rep);
+                          xXIListPropertiesReply * rep);
+void SRepXIGetProperty(ClientPtr client, int size, xXIGetPropertyReply * rep);
 
 void XIResetProperties(void);
 
-#endif /* XIPROPERTY_H */
+#endif                          /* XIPROPERTY_H */
-- 
cgit v1.2.3