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, 24 deletions

diff --git a/glx/unpack.h b/glx/unpack.h
index 738e79dc4..0a088fc33 100644
--- a/glx/unpack.h
+++ b/glx/unpack.h
@@ -67,7 +67,7 @@ extern xGLXSingleReply __glXReply;
 
 #define __GLX_PUT_RETVAL(a) \
   	__glXReply.retval = (a);
-  
+
 #define __GLX_PUT_SIZE(a) \
   	__glXReply.size = (a);
 
@@ -102,35 +102,34 @@ extern xGLXSingleReply __glXReply;
 
 #define __GLX_PUT_BYTE() \
   	*(GLbyte *)&__glXReply.pad3 = *(GLbyte *)answer
-	  
+
 #define __GLX_PUT_SHORT() \
   	*(GLshort *)&__glXReply.pad3 = *(GLshort *)answer
-	  
+
 #define __GLX_PUT_INT() \
   	*(GLint *)&__glXReply.pad3 = *(GLint *)answer
-	  
+
 #define __GLX_PUT_FLOAT() \
   	*(GLfloat *)&__glXReply.pad3 = *(GLfloat *)answer
-	  
+
 #define __GLX_PUT_DOUBLE() \
   	*(GLdouble *)&__glXReply.pad3 = *(GLdouble *)answer
-	  
+
 #define __GLX_SEND_BYTE_ARRAY(len) \
 	WriteToClient(client, __GLX_PAD((len)*__GLX_SIZE_INT8), (char *)answer)
 
 #define __GLX_SEND_SHORT_ARRAY(len) \
 	WriteToClient(client, __GLX_PAD((len)*__GLX_SIZE_INT16), (char *)answer)
-  
+
 #define __GLX_SEND_INT_ARRAY(len) \
 	WriteToClient(client, (len)*__GLX_SIZE_INT32, (char *)answer)
-  
+
 #define __GLX_SEND_FLOAT_ARRAY(len) \
 	WriteToClient(client, (len)*__GLX_SIZE_FLOAT32, (char *)answer)
-  
+
 #define __GLX_SEND_DOUBLE_ARRAY(len) \
 	WriteToClient(client, (len)*__GLX_SIZE_FLOAT64, (char *)answer)
 
-
 #define __GLX_SEND_VOID_ARRAY(len)  __GLX_SEND_BYTE_ARRAY(len)
 #define __GLX_SEND_UBYTE_ARRAY(len)  __GLX_SEND_BYTE_ARRAY(len)
 #define __GLX_SEND_USHORT_ARRAY(len) __GLX_SEND_SHORT_ARRAY(len)
@@ -148,19 +147,18 @@ extern xGLXSingleReply __glXReply;
   	GLbyte *swapPC;		\
   	GLbyte *swapEnd
 
-
 #define __GLX_SWAP_INT(pc) 			\
   	sw = ((GLbyte *)(pc))[0]; 		\
   	((GLbyte *)(pc))[0] = ((GLbyte *)(pc))[3]; 	\
   	((GLbyte *)(pc))[3] = sw; 		\
   	sw = ((GLbyte *)(pc))[1]; 		\
   	((GLbyte *)(pc))[1] = ((GLbyte *)(pc))[2]; 	\
-  	((GLbyte *)(pc))[2] = sw;	
+  	((GLbyte *)(pc))[2] = sw;
 
 #define __GLX_SWAP_SHORT(pc) \
   	sw = ((GLbyte *)(pc))[0]; 		\
   	((GLbyte *)(pc))[0] = ((GLbyte *)(pc))[1]; 	\
-  	((GLbyte *)(pc))[1] = sw; 	
+  	((GLbyte *)(pc))[1] = sw;
 
 #define __GLX_SWAP_DOUBLE(pc) \
   	sw = ((GLbyte *)(pc))[0]; 		\
@@ -174,7 +172,7 @@ extern xGLXSingleReply __glXReply;
   	((GLbyte *)(pc))[5] = sw;			\
   	sw = ((GLbyte *)(pc))[3]; 		\
   	((GLbyte *)(pc))[3] = ((GLbyte *)(pc))[4]; 	\
-  	((GLbyte *)(pc))[4] = sw;	
+  	((GLbyte *)(pc))[4] = sw;
 
 #define __GLX_SWAP_FLOAT(pc) \
   	sw = ((GLbyte *)(pc))[0]; 		\
@@ -182,7 +180,7 @@ extern xGLXSingleReply __glXReply;
   	((GLbyte *)(pc))[3] = sw; 		\
   	sw = ((GLbyte *)(pc))[1]; 		\
   	((GLbyte *)(pc))[1] = ((GLbyte *)(pc))[2]; 	\
-  	((GLbyte *)(pc))[2] = sw;	
+  	((GLbyte *)(pc))[2] = sw;
 
 #define __GLX_SWAP_INT_ARRAY(pc, count) \
   	swapPC = ((GLbyte *)(pc));		\
@@ -191,7 +189,7 @@ extern xGLXSingleReply __glXReply;
 	    __GLX_SWAP_INT(swapPC);		\
 	    swapPC += __GLX_SIZE_INT32;		\
 	}
-	
+
 #define __GLX_SWAP_SHORT_ARRAY(pc, count) \
   	swapPC = ((GLbyte *)(pc));		\
   	swapEnd = ((GLbyte *)(pc)) + (count)*__GLX_SIZE_INT16;\
@@ -199,7 +197,7 @@ extern xGLXSingleReply __glXReply;
 	    __GLX_SWAP_SHORT(swapPC);		\
 	    swapPC += __GLX_SIZE_INT16;		\
 	}
-	
+
 #define __GLX_SWAP_DOUBLE_ARRAY(pc, count) \
   	swapPC = ((GLbyte *)(pc));		\
   	swapEnd = ((GLbyte *)(pc)) + (count)*__GLX_SIZE_FLOAT64;\
@@ -207,7 +205,7 @@ extern xGLXSingleReply __glXReply;
 	    __GLX_SWAP_DOUBLE(swapPC);		\
 	    swapPC += __GLX_SIZE_FLOAT64;	\
 	}
-    
+
 #define __GLX_SWAP_FLOAT_ARRAY(pc, count) \
   	swapPC = ((GLbyte *)(pc));		\
   	swapEnd = ((GLbyte *)(pc)) + (count)*__GLX_SIZE_FLOAT32;\
@@ -226,9 +224,4 @@ extern xGLXSingleReply __glXReply;
 #define __GLX_SWAP_REPLY_SIZE() \
   	__GLX_SWAP_INT(&__glXReply.size)
 
-#endif /* !__GLX_unpack_h__ */
-
-
-
-
-
+#endif                          /* !__GLX_unpack_h__ */