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, 42 insertions, 49 deletions

diff --git a/glx/glxcontext.h b/glx/glxcontext.h
index 65d51f507..ef2c4dbd5 100644
--- a/glx/glxcontext.h
+++ b/glx/glxcontext.h
@@ -37,95 +37,88 @@
 
 typedef struct __GLXtextureFromPixmap __GLXtextureFromPixmap;
 struct __GLXtextureFromPixmap {
-    int (*bindTexImage)		(__GLXcontext  *baseContext,
-				 int            buffer,
-				 __GLXdrawable *pixmap);
-    int (*releaseTexImage)	(__GLXcontext  *baseContext,
-				 int            buffer,
-				 __GLXdrawable *pixmap);
+    int (*bindTexImage) (__GLXcontext * baseContext,
+                         int buffer, __GLXdrawable * pixmap);
+    int (*releaseTexImage) (__GLXcontext * baseContext,
+                            int buffer, __GLXdrawable * pixmap);
 };
 
-
 struct __GLXcontext {
-    void           (*destroy)       (__GLXcontext *context);
-    int            (*makeCurrent)   (__GLXcontext *context);
-    int            (*loseCurrent)   (__GLXcontext *context);
-    int            (*copy)          (__GLXcontext *dst,
-				     __GLXcontext *src,
-				     unsigned long mask);
-    Bool           (*wait)          (__GLXcontext *context,
-				     __GLXclientState *cl,
-				     int *error);
+    void (*destroy) (__GLXcontext * context);
+    int (*makeCurrent) (__GLXcontext * context);
+    int (*loseCurrent) (__GLXcontext * context);
+    int (*copy) (__GLXcontext * dst, __GLXcontext * src, unsigned long mask);
+    Bool (*wait) (__GLXcontext * context, __GLXclientState * cl, int *error);
 
     __GLXtextureFromPixmap *textureFromPixmap;
 
     /*
-    ** list of context structs
-    */
+     ** list of context structs
+     */
     __GLXcontext *last;
     __GLXcontext *next;
 
     /*
-    ** config struct for this context
-    */
+     ** config struct for this context
+     */
     __GLXconfig *config;
 
     /*
-    ** Pointer to screen info data for this context.  This is set
-    ** when the context is created.
-    */
+     ** Pointer to screen info data for this context.  This is set
+     ** when the context is created.
+     */
     __GLXscreen *pGlxScreen;
 
     /*
-    ** The XID of this context.
-    */
+     ** The XID of this context.
+     */
     XID id;
 
     /*
-    ** The XID of the shareList context.
-    */
+     ** The XID of the shareList context.
+     */
     XID share_id;
 
     /*
-    ** Whether this context's ID still exists.
-    */
+     ** Whether this context's ID still exists.
+     */
     GLboolean idExists;
-    
+
     /*
-    ** Whether this context is current for some client.
-    */
+     ** Whether this context is current for some client.
+     */
     GLboolean isCurrent;
-    
+
     /*
-    ** Whether this context is a direct rendering context.
-    */
+     ** Whether this context is a direct rendering context.
+     */
     GLboolean isDirect;
 
     /*
-    ** This flag keeps track of whether there are unflushed GL commands.
-    */
+     ** This flag keeps track of whether there are unflushed GL commands.
+     */
     GLboolean hasUnflushedCommands;
-    
+
     /*
-    ** Current rendering mode for this context.
-    */
+     ** Current rendering mode for this context.
+     */
     GLenum renderMode;
-    
+
     /*
-    ** Buffers for feedback and selection.
-    */
+     ** Buffers for feedback and selection.
+     */
     GLfloat *feedbackBuf;
-    GLint feedbackBufSize;	/* number of elements allocated */
+    GLint feedbackBufSize;      /* number of elements allocated */
     GLuint *selectBuf;
-    GLint selectBufSize;	/* number of elements allocated */
+    GLint selectBufSize;        /* number of elements allocated */
 
     /*
-    ** The drawable private this context is bound to
-    */
+     ** The drawable private this context is bound to
+     */
     __GLXdrawable *drawPriv;
     __GLXdrawable *readPriv;
 };
 
-void __glXContextDestroy(__GLXcontext *context);
+void __glXContextDestroy(__GLXcontext * context);
 
-#endif /* !__GLX_context_h__ */
+#endif                          /* !__GLX_context_h__ */