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, 101 insertions, 110 deletions

diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c
index 8bd8e3478..cb8ba9103 100644
--- a/hw/xwin/winpixmap.c
+++ b/hw/xwin/winpixmap.c
@@ -34,96 +34,93 @@
 #endif
 #include "win.h"
 
-
 /*
  * Local prototypes
  */
 
 #if 0
 static void
-winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw);
+ winXRotatePixmapNativeGDI(PixmapPtr pPix, int rw);
 
 static void
-winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh);
+ winYRotatePixmapNativeGDI(PixmapPtr pPix, int rh);
 
 static void
-winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
-			      int xrot, int yrot);
-#endif
 
+winCopyRotatePixmapNativeGDI(PixmapPtr psrcPix, PixmapPtr *ppdstPix,
+                             int xrot, int yrot);
+#endif
 
 /* See Porting Layer Definition - p. 34 */
 /* See mfb/mfbpixmap.c - mfbCreatePixmap() */
 PixmapPtr
-winCreatePixmapNativeGDI (ScreenPtr pScreen,
-			  int iWidth, int iHeight,
-			  int iDepth, unsigned usage_hint)
+winCreatePixmapNativeGDI(ScreenPtr pScreen,
+                         int iWidth, int iHeight,
+                         int iDepth, unsigned usage_hint)
 {
-  winPrivPixmapPtr	pPixmapPriv = NULL;
-  PixmapPtr		pPixmap = NULL;
-
-  /* Allocate pixmap memory */
-  pPixmap = AllocatePixmap (pScreen, 0);
-  if (!pPixmap)
-    {
-      ErrorF ("winCreatePixmapNativeGDI () - Couldn't allocate a pixmap\n");
-      return NullPixmap;
+    winPrivPixmapPtr pPixmapPriv = NULL;
+    PixmapPtr pPixmap = NULL;
+
+    /* Allocate pixmap memory */
+    pPixmap = AllocatePixmap(pScreen, 0);
+    if (!pPixmap) {
+        ErrorF("winCreatePixmapNativeGDI () - Couldn't allocate a pixmap\n");
+        return NullPixmap;
     }
 
 #if CYGDEBUG
-  winDebug ("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",
-	  iWidth, iHeight, iDepth, usage_hint,
-	  PixmapBytePad (iWidth, iDepth));
+    winDebug("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",
+             iWidth, iHeight, iDepth, usage_hint,
+             PixmapBytePad(iWidth, iDepth));
 #endif
 
-  /* Setup pixmap values */
-  pPixmap->drawable.type = DRAWABLE_PIXMAP;
-  pPixmap->drawable.class = 0;
-  pPixmap->drawable.pScreen = pScreen;
-  pPixmap->drawable.depth = iDepth;
-  pPixmap->drawable.bitsPerPixel = BitsPerPixel (iDepth);
-  pPixmap->drawable.id = 0;
-  pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
-  pPixmap->drawable.x = 0;
-  pPixmap->drawable.y = 0;
-  pPixmap->drawable.width = iWidth;
-  pPixmap->drawable.height = iHeight;
-  pPixmap->devKind = 0;
-  pPixmap->refcnt = 1;
-  pPixmap->devPrivate.ptr = NULL;
-  pPixmap->usage_hint = usage_hint;
-
-  /* Pixmap privates are allocated by AllocatePixmap */
-  pPixmapPriv = winGetPixmapPriv (pPixmap);
-
-  /* Initialize pixmap privates */
-  pPixmapPriv->hBitmap = NULL;
-  pPixmapPriv->hdcSelected = NULL;
-  pPixmapPriv->pbBits = NULL;
-  pPixmapPriv->dwScanlineBytes = PixmapBytePad (iWidth, iDepth);
-
-  /* Check for zero width or height pixmaps */
-  if (iWidth == 0 || iHeight == 0)
-    {
-      /* Don't allocate a real pixmap, just set fields and return */
-      return pPixmap;
+    /* Setup pixmap values */
+    pPixmap->drawable.type = DRAWABLE_PIXMAP;
+    pPixmap->drawable.class = 0;
+    pPixmap->drawable.pScreen = pScreen;
+    pPixmap->drawable.depth = iDepth;
+    pPixmap->drawable.bitsPerPixel = BitsPerPixel(iDepth);
+    pPixmap->drawable.id = 0;
+    pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+    pPixmap->drawable.x = 0;
+    pPixmap->drawable.y = 0;
+    pPixmap->drawable.width = iWidth;
+    pPixmap->drawable.height = iHeight;
+    pPixmap->devKind = 0;
+    pPixmap->refcnt = 1;
+    pPixmap->devPrivate.ptr = NULL;
+    pPixmap->usage_hint = usage_hint;
+
+    /* Pixmap privates are allocated by AllocatePixmap */
+    pPixmapPriv = winGetPixmapPriv(pPixmap);
+
+    /* Initialize pixmap privates */
+    pPixmapPriv->hBitmap = NULL;
+    pPixmapPriv->hdcSelected = NULL;
+    pPixmapPriv->pbBits = NULL;
+    pPixmapPriv->dwScanlineBytes = PixmapBytePad(iWidth, iDepth);
+
+    /* Check for zero width or height pixmaps */
+    if (iWidth == 0 || iHeight == 0) {
+        /* Don't allocate a real pixmap, just set fields and return */
+        return pPixmap;
     }
 
-  /* Create a DIB for the pixmap */
-  pPixmapPriv->hBitmap = winCreateDIBNativeGDI (iWidth, iHeight, iDepth,
-						&pPixmapPriv->pbBits,
-						(BITMAPINFO **) &pPixmapPriv->pbmih);
+    /* Create a DIB for the pixmap */
+    pPixmapPriv->hBitmap = winCreateDIBNativeGDI(iWidth, iHeight, iDepth,
+                                                 &pPixmapPriv->pbBits,
+                                                 (BITMAPINFO **) & pPixmapPriv->
+                                                 pbmih);
 
 #if CYGDEBUG
-  winDebug ("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " \
-	  "screen: %08x\n",
-	  pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
+    winDebug("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for "
+             "screen: %08x\n",
+             pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
 #endif
 
-  return pPixmap;
+    return pPixmap;
 }
 
-
 /* 
  * See Porting Layer Definition - p. 35
  *
@@ -131,66 +128,62 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
  */
 
 Bool
-winDestroyPixmapNativeGDI (PixmapPtr pPixmap)
+winDestroyPixmapNativeGDI(PixmapPtr pPixmap)
 {
-  winPrivPixmapPtr		pPixmapPriv = NULL;
-  
+    winPrivPixmapPtr pPixmapPriv = NULL;
+
 #if CYGDEBUG
-  winDebug ("winDestroyPixmapNativeGDI ()\n");
+    winDebug("winDestroyPixmapNativeGDI ()\n");
 #endif
 
-  /* Bail early if there is not a pixmap to destroy */
-  if (pPixmap == NULL)
-    {
-      ErrorF ("winDestroyPixmapNativeGDI () - No pixmap to destroy\n");
-      return TRUE;
+    /* Bail early if there is not a pixmap to destroy */
+    if (pPixmap == NULL) {
+        ErrorF("winDestroyPixmapNativeGDI () - No pixmap to destroy\n");
+        return TRUE;
     }
 
-  /* Get a handle to the pixmap privates */
-  pPixmapPriv = winGetPixmapPriv (pPixmap);
+    /* Get a handle to the pixmap privates */
+    pPixmapPriv = winGetPixmapPriv(pPixmap);
 
 #if CYGDEBUG
-  winDebug ("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
-	  pPixmapPriv->hBitmap);
+    winDebug("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
+             pPixmapPriv->hBitmap);
 #endif
 
-  /* Decrement reference count, return if nonzero */
-  --pPixmap->refcnt;
-  if (pPixmap->refcnt != 0)
-    return TRUE;
+    /* Decrement reference count, return if nonzero */
+    --pPixmap->refcnt;
+    if (pPixmap->refcnt != 0)
+        return TRUE;
 
-  /* Free GDI bitmap */
-  if (pPixmapPriv->hBitmap) DeleteObject (pPixmapPriv->hBitmap);
-  
-  /* Free the bitmap info header memory */
-  free(pPixmapPriv->pbmih);
-  pPixmapPriv->pbmih = NULL;
+    /* Free GDI bitmap */
+    if (pPixmapPriv->hBitmap)
+        DeleteObject(pPixmapPriv->hBitmap);
 
-  /* Free the pixmap memory */
-  free (pPixmap);
-  pPixmap = NULL;
+    /* Free the bitmap info header memory */
+    free(pPixmapPriv->pbmih);
+    pPixmapPriv->pbmih = NULL;
 
-  return TRUE;
-}
+    /* Free the pixmap memory */
+    free(pPixmap);
+    pPixmap = NULL;
 
+    return TRUE;
+}
 
 /* 
  * Not used yet
  */
 
 Bool
-winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,
-				int iWidth, int iHeight,
-				int iDepth,
-				int iBitsPerPixel,
-				int devKind,
-				pointer pPixData)
+winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
+                               int iWidth, int iHeight,
+                               int iDepth,
+                               int iBitsPerPixel, int devKind, pointer pPixData)
 {
-  FatalError ("winModifyPixmapHeaderNativeGDI ()\n");
-  return TRUE;
+    FatalError("winModifyPixmapHeaderNativeGDI ()\n");
+    return TRUE;
 }
 
-
 #if 0
 /* 
  * Not used yet.
@@ -198,35 +191,33 @@ winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,
  */
 
 static void
-winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw)
+winXRotatePixmapNativeGDI(PixmapPtr pPix, int rw)
 {
-  ErrorF ("winXRotatePixmap()\n");
-  /* fill in this function, look at CFB */
+    ErrorF("winXRotatePixmap()\n");
+    /* fill in this function, look at CFB */
 }
 
-
 /*
  * Not used yet.
  * See cfb/cfbpixmap.c
  */
 static void
-winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh)
+winYRotatePixmapNativeGDI(PixmapPtr pPix, int rh)
 {
-  ErrorF ("winYRotatePixmap()\n");
-  /* fill in this function, look at CFB */
+    ErrorF("winYRotatePixmap()\n");
+    /* fill in this function, look at CFB */
 }
 
-
 /* 
  * Not used yet.
  * See cfb/cfbpixmap.c
  */
 
 static void
-winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
-			      int xrot, int yrot)
+winCopyRotatePixmapNativeGDI(PixmapPtr psrcPix, PixmapPtr *ppdstPix,
+                             int xrot, int yrot)
 {
-  ErrorF ("winCopyRotatePixmap()\n");
-  /* fill in this function, look at CFB */
+    ErrorF("winCopyRotatePixmap()\n");
+    /* fill in this function, look at CFB */
 }
 #endif