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

diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index 79277021a..b6ff6f918 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -48,89 +48,86 @@ Equipment Corporation.
 #include "panoramiXh.h"
 
 static int
-SProcPanoramiXQueryVersion (ClientPtr client)
+SProcPanoramiXQueryVersion(ClientPtr client)
 {
-	REQUEST(xPanoramiXQueryVersionReq);
+    REQUEST(xPanoramiXQueryVersionReq);
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
-	return ProcPanoramiXQueryVersion(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq);
+    return ProcPanoramiXQueryVersion(client);
 }
 
 static int
 SProcPanoramiXGetState(ClientPtr client)
 {
-	REQUEST(xPanoramiXGetStateReq);
+    REQUEST(xPanoramiXGetStateReq);
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-	swapl(&stuff->window);
-	return ProcPanoramiXGetState(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
+    swapl(&stuff->window);
+    return ProcPanoramiXGetState(client);
 }
 
-static int 
+static int
 SProcPanoramiXGetScreenCount(ClientPtr client)
 {
-	REQUEST(xPanoramiXGetScreenCountReq);
+    REQUEST(xPanoramiXGetScreenCountReq);
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-	swapl(&stuff->window);
-	return ProcPanoramiXGetScreenCount(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
+    swapl(&stuff->window);
+    return ProcPanoramiXGetScreenCount(client);
 }
 
-static int 
+static int
 SProcPanoramiXGetScreenSize(ClientPtr client)
 {
-	REQUEST(xPanoramiXGetScreenSizeReq);
+    REQUEST(xPanoramiXGetScreenSizeReq);
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-	swapl(&stuff->window);
-	swapl(&stuff->screen);
-	return ProcPanoramiXGetScreenSize(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
+    swapl(&stuff->window);
+    swapl(&stuff->screen);
+    return ProcPanoramiXGetScreenSize(client);
 }
 
-
-static int 
+static int
 SProcXineramaIsActive(ClientPtr client)
 {
-	REQUEST(xXineramaIsActiveReq);
+    REQUEST(xXineramaIsActiveReq);
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
-	return ProcXineramaIsActive(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
+    return ProcXineramaIsActive(client);
 }
 
-
-static int 
+static int
 SProcXineramaQueryScreens(ClientPtr client)
 {
-	REQUEST(xXineramaQueryScreensReq);
+    REQUEST(xXineramaQueryScreensReq);
 
-	swaps(&stuff->length);
-	REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
-	return ProcXineramaQueryScreens(client);
+    swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
+    return ProcXineramaQueryScreens(client);
 }
 
-
 int
-SProcPanoramiXDispatch (ClientPtr client)
-{   REQUEST(xReq);
-    switch (stuff->data)
-    {
-	case X_PanoramiXQueryVersion:
-	     return SProcPanoramiXQueryVersion(client);
-	case X_PanoramiXGetState:
-	     return SProcPanoramiXGetState(client);
-	case X_PanoramiXGetScreenCount:
-	     return SProcPanoramiXGetScreenCount(client);
-	case X_PanoramiXGetScreenSize:
-	     return SProcPanoramiXGetScreenSize(client);
-	case X_XineramaIsActive:
-	     return SProcXineramaIsActive(client);
-	case X_XineramaQueryScreens:
-	     return SProcXineramaQueryScreens(client);
+SProcPanoramiXDispatch(ClientPtr client)
+{
+    REQUEST(xReq);
+    switch (stuff->data) {
+    case X_PanoramiXQueryVersion:
+        return SProcPanoramiXQueryVersion(client);
+    case X_PanoramiXGetState:
+        return SProcPanoramiXGetState(client);
+    case X_PanoramiXGetScreenCount:
+        return SProcPanoramiXGetScreenCount(client);
+    case X_PanoramiXGetScreenSize:
+        return SProcPanoramiXGetScreenSize(client);
+    case X_XineramaIsActive:
+        return SProcXineramaIsActive(client);
+    case X_XineramaQueryScreens:
+        return SProcXineramaQueryScreens(client);
     }
     return BadRequest;
 }