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

diff --git a/hw/xquartz/xpr/dri.h b/hw/xquartz/xpr/dri.h
index 48fea3668..b4342617c 100644
--- a/hw/xquartz/xpr/dri.h
+++ b/hw/xquartz/xpr/dri.h
@@ -43,8 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "appledri.h"
 #include <Xplugin.h>
 
-typedef void (*ClipNotifyPtr)( WindowPtr, int, int );
-
+typedef void (*ClipNotifyPtr) (WindowPtr, int, int);
 
 /*
  * These functions can be wrapped by the DRI.  Each of these have
@@ -52,11 +51,11 @@ typedef void (*ClipNotifyPtr)( WindowPtr, int, int );
  * overridden by the driver in its [driver]DRIScreenInit function.
  */
 typedef struct {
-    WindowExposuresProcPtr       WindowExposures;
-    CopyWindowProcPtr            CopyWindow;
-    ValidateTreeProcPtr          ValidateTree;
-    PostValidateTreeProcPtr      PostValidateTree;
-    ClipNotifyProcPtr            ClipNotify;
+    WindowExposuresProcPtr WindowExposures;
+    CopyWindowProcPtr CopyWindow;
+    ValidateTreeProcPtr ValidateTree;
+    PostValidateTreeProcPtr PostValidateTree;
+    ClipNotifyProcPtr ClipNotify;
 } DRIWrappedFuncsRec, *DRIWrappedFuncsPtr;
 
 typedef struct {
@@ -74,8 +73,7 @@ extern Bool DRIExtensionInit(void);
 
 extern void DRIReset(void);
 
-extern Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen,
-                                           Bool *isCapable);
+extern Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool *isCapable);
 
 extern Bool DRIAuthConnection(ScreenPtr pScreen, unsigned int magic);
 
@@ -83,55 +81,43 @@ extern Bool DRICreateSurface(ScreenPtr pScreen,
                              Drawable id,
                              DrawablePtr pDrawable,
                              xp_client_id client_id,
-                             xp_surface_id *surface_id,
+                             xp_surface_id * surface_id,
                              unsigned int key[2],
                              void (*notify) (void *arg, void *data),
                              void *notify_data);
 
 extern Bool DRIDestroySurface(ScreenPtr pScreen,
-                             Drawable id,
-                             DrawablePtr pDrawable,
-                             void (*notify) (void *arg, void *data),
-                             void *notify_data);
+                              Drawable id,
+                              DrawablePtr pDrawable,
+                              void (*notify) (void *arg, void *data),
+                              void *notify_data);
 
-extern Bool DRIDrawablePrivDelete(pointer pResource,
-                                  XID id);
+extern Bool DRIDrawablePrivDelete(pointer pResource, XID id);
 
 extern DRIWrappedFuncsRec *DRIGetWrappedFuncs(ScreenPtr pScreen);
 
 extern void DRICopyWindow(WindowPtr pWin,
-                          DDXPointRec ptOldOrg,
-                          RegionPtr prgnSrc);
+                          DDXPointRec ptOldOrg, RegionPtr prgnSrc);
 
-extern int DRIValidateTree(WindowPtr pParent,
-                           WindowPtr pChild,
-                           VTKind    kind);
+extern int DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
 
 extern void DRIPostValidateTree(WindowPtr pParent,
-                                WindowPtr pChild,
-                                VTKind    kind);
+                                WindowPtr pChild, VTKind kind);
 
-extern void DRIClipNotify(WindowPtr pWin,
-                          int dx,
-                          int dy);
+extern void DRIClipNotify(WindowPtr pWin, int dx, int dy);
 
-extern void DRIWindowExposures(WindowPtr pWin,
-                              RegionPtr prgn,
-                              RegionPtr bsreg);
+extern void DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg);
 
-extern void DRISurfaceNotify (xp_surface_id id, int kind);
+extern void DRISurfaceNotify(xp_surface_id id, int kind);
 
 extern void DRIQueryVersion(int *majorVersion,
-                            int *minorVersion,
-                            int *patchVersion);
+                            int *minorVersion, int *patchVersion);
 
 extern Bool DRICreatePixmap(ScreenPtr pScreen, Drawable id,
-			    DrawablePtr pDrawable, char *path,
-			    size_t pathmax);
+                            DrawablePtr pDrawable, char *path, size_t pathmax);
 
 extern Bool DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height,
-			     int *pitch, int *bpp, void **ptr);
-
+                             int *pitch, int *bpp, void **ptr);
 
 extern void DRIDestroyPixmap(DrawablePtr pDrawable);