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, 15 insertions, 22 deletions

diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c
index 227da3118..7b6a2c679 100644
--- a/fb/fbcmap_mi.c
+++ b/fb/fbcmap_mi.c
@@ -27,7 +27,6 @@
  * XFree86Server being defined.
  */
 
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
@@ -37,7 +36,7 @@
 #include "micmap.h"
 
 int
-fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
+fbListInstalledColormaps(ScreenPtr pScreen, Colormap * pmaps)
 {
     return miListInstalledColormaps(pScreen, pmaps);
 }
@@ -55,10 +54,8 @@ fbUninstallColormap(ColormapPtr pmap)
 }
 
 void
-fbResolveColor(unsigned short   *pred,
-	       unsigned short   *pgreen,
-	       unsigned short   *pblue,
-	       VisualPtr	pVisual)
+fbResolveColor(unsigned short *pred,
+               unsigned short *pgreen, unsigned short *pblue, VisualPtr pVisual)
 {
     miResolveColor(pred, pgreen, pblue, pVisual);
 }
@@ -70,10 +67,8 @@ fbInitializeColormap(ColormapPtr pmap)
 }
 
 int
-fbExpandDirectColors (ColormapPtr   pmap,
-		      int	    ndef,
-		      xColorItem    *indefs,
-		      xColorItem    *outdefs)
+fbExpandDirectColors(ColormapPtr pmap,
+                     int ndef, xColorItem * indefs, xColorItem * outdefs)
 {
     return miExpandDirectColors(pmap, ndef, indefs, outdefs);
 }
@@ -91,14 +86,14 @@ fbClearVisualTypes(void)
 }
 
 Bool
-fbSetVisualTypes (int depth, int visuals, int bitsPerRGB)
+fbSetVisualTypes(int depth, int visuals, int bitsPerRGB)
 {
     return miSetVisualTypes(depth, visuals, bitsPerRGB, -1);
 }
 
 Bool
-fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
-                          Pixel redMask, Pixel greenMask, Pixel blueMask)
+fbSetVisualTypesAndMasks(int depth, int visuals, int bitsPerRGB,
+                         Pixel redMask, Pixel greenMask, Pixel blueMask)
 {
     return miSetVisualTypesAndMasks(depth, visuals, bitsPerRGB, -1,
                                     redMask, greenMask, blueMask);
@@ -110,15 +105,13 @@ fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB,
  * the set which can be used with this version of fb.
  */
 Bool
-fbInitVisuals (VisualPtr    *visualp, 
-	       DepthPtr	    *depthp,
-	       int	    *nvisualp,
-	       int	    *ndepthp,
-	       int	    *rootDepthp,
-	       VisualID	    *defaultVisp,
-	       unsigned long	sizes,
-	       int	    bitsPerRGB)
+fbInitVisuals(VisualPtr * visualp,
+              DepthPtr * depthp,
+              int *nvisualp,
+              int *ndepthp,
+              int *rootDepthp,
+              VisualID * defaultVisp, unsigned long sizes, int bitsPerRGB)
 {
     return miInitVisuals(visualp, depthp, nvisualp, ndepthp, rootDepthp,
-			 defaultVisp, sizes, bitsPerRGB, -1);
+                         defaultVisp, sizes, bitsPerRGB, -1);
 }