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/include/pixmap.h b/include/pixmap.h
index 014a11183..26d737c4d 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
-
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
@@ -71,12 +70,12 @@ SOFTWARE.
 
 #define NullPixmap ((PixmapPtr)0)
 
-typedef struct _Drawable *DrawablePtr;	
+typedef struct _Drawable *DrawablePtr;
 typedef struct _Pixmap *PixmapPtr;
 
 typedef union _PixUnion {
-    PixmapPtr		pixmap;
-    unsigned long	pixel;
+    PixmapPtr pixmap;
+    unsigned long pixel;
 } PixUnion;
 
 #define SamePixUnion(a,b,isPixel)\
@@ -91,29 +90,23 @@ typedef union _PixUnion {
 #define WindowDrawable(type) \
 	((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW))
 
-extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(
-    ScreenPtr /*pScreen*/,
-    int /*width*/,
-    int /*height*/,
-    int /*depth*/,
-    int /*bitsPerPixel*/,
-    int /*devKind*/,
-    pointer /*pPixData*/);
+extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr /*pScreen */ ,
+                                                  int /*width */ ,
+                                                  int /*height */ ,
+                                                  int /*depth */ ,
+                                                  int /*bitsPerPixel */ ,
+                                                  int /*devKind */ ,
+                                                  pointer /*pPixData */ );
 
-extern _X_EXPORT void FreeScratchPixmapHeader(
-    PixmapPtr /*pPixmap*/);
+extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ );
 
-extern _X_EXPORT Bool CreateScratchPixmapsForScreen(
-    int /*scrnum*/);
+extern _X_EXPORT Bool CreateScratchPixmapsForScreen(int /*scrnum */ );
 
-extern _X_EXPORT void FreeScratchPixmapsForScreen(
-    int /*scrnum*/);
+extern _X_EXPORT void FreeScratchPixmapsForScreen(int /*scrnum */ );
 
-extern _X_EXPORT PixmapPtr AllocatePixmap(
-    ScreenPtr /*pScreen*/,
-    int /*pixDataSize*/);
+extern _X_EXPORT PixmapPtr AllocatePixmap(ScreenPtr /*pScreen */ ,
+                                          int /*pixDataSize */ );
 
-extern _X_EXPORT void FreePixmap(
-    PixmapPtr /*pPixmap*/);
+extern _X_EXPORT void FreePixmap(PixmapPtr /*pPixmap */ );
 
-#endif /* PIXMAP_H */
+#endif                          /* PIXMAP_H */