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, 107 insertions, 97 deletions

diff --git a/glx/singlesize.c b/glx/singlesize.c
index 6149b614c..777ebb35e 100644
--- a/glx/singlesize.c
+++ b/glx/singlesize.c
@@ -48,146 +48,156 @@
 ** Hence, they are located here, in the GLX extension library.
 */
 
-GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h)
+GLint
+__glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h)
 {
-    return __glXImageSize( format, type, 0, w, h, 1, 0, 0, 0, 0, 4 );
+    return __glXImageSize(format, type, 0, w, h, 1, 0, 0, 0, 0, 4);
 }
 
-GLint __glGetMap_size(GLenum target, GLenum query)
+GLint
+__glGetMap_size(GLenum target, GLenum query)
 {
-    GLint k, order=0, majorMinor[2];
+    GLint k, order = 0, majorMinor[2];
 
     /*
-    ** Assume target and query are both valid.
-    */
+     ** Assume target and query are both valid.
+     */
     switch (target) {
-      case GL_MAP1_COLOR_4:
-      case GL_MAP1_NORMAL:
-      case GL_MAP1_INDEX:
-      case GL_MAP1_TEXTURE_COORD_1:
-      case GL_MAP1_TEXTURE_COORD_2:
-      case GL_MAP1_TEXTURE_COORD_3:
-      case GL_MAP1_TEXTURE_COORD_4:
-      case GL_MAP1_VERTEX_3:
-      case GL_MAP1_VERTEX_4:
-	switch (query) {
-	  case GL_COEFF:
-	    k = __glMap1d_size(target);
-	    CALL_GetMapiv( GET_DISPATCH(), (target, GL_ORDER, &order) );
-	    /*
-	    ** The query above might fail, but then order will be zero anyway.
-	    */
-	    return order * k;
-	  case GL_DOMAIN:
-	    return 2;
-	  case GL_ORDER:
-	    return 1;
-	}
-	break;
-      case GL_MAP2_COLOR_4:
-      case GL_MAP2_NORMAL:
-      case GL_MAP2_INDEX:
-      case GL_MAP2_TEXTURE_COORD_1:
-      case GL_MAP2_TEXTURE_COORD_2:
-      case GL_MAP2_TEXTURE_COORD_3:
-      case GL_MAP2_TEXTURE_COORD_4:
-      case GL_MAP2_VERTEX_3:
-      case GL_MAP2_VERTEX_4:
-	switch (query) {
-	  case GL_COEFF:
-	    k = __glMap2d_size(target);
-	    majorMinor[0] = majorMinor[1] = 0;
-	    CALL_GetMapiv( GET_DISPATCH(), (target, GL_ORDER, majorMinor) );
-	    /*
-	    ** The query above might fail, but then majorMinor will be zeroes
-	    */
-	    return majorMinor[0] * majorMinor[1] * k;
-	  case GL_DOMAIN:
-	    return 4;
-	  case GL_ORDER:
-	    return 2;
-	}
-	break;
+    case GL_MAP1_COLOR_4:
+    case GL_MAP1_NORMAL:
+    case GL_MAP1_INDEX:
+    case GL_MAP1_TEXTURE_COORD_1:
+    case GL_MAP1_TEXTURE_COORD_2:
+    case GL_MAP1_TEXTURE_COORD_3:
+    case GL_MAP1_TEXTURE_COORD_4:
+    case GL_MAP1_VERTEX_3:
+    case GL_MAP1_VERTEX_4:
+        switch (query) {
+        case GL_COEFF:
+            k = __glMap1d_size(target);
+            CALL_GetMapiv(GET_DISPATCH(), (target, GL_ORDER, &order));
+            /*
+             ** The query above might fail, but then order will be zero anyway.
+             */
+            return order * k;
+        case GL_DOMAIN:
+            return 2;
+        case GL_ORDER:
+            return 1;
+        }
+        break;
+    case GL_MAP2_COLOR_4:
+    case GL_MAP2_NORMAL:
+    case GL_MAP2_INDEX:
+    case GL_MAP2_TEXTURE_COORD_1:
+    case GL_MAP2_TEXTURE_COORD_2:
+    case GL_MAP2_TEXTURE_COORD_3:
+    case GL_MAP2_TEXTURE_COORD_4:
+    case GL_MAP2_VERTEX_3:
+    case GL_MAP2_VERTEX_4:
+        switch (query) {
+        case GL_COEFF:
+            k = __glMap2d_size(target);
+            majorMinor[0] = majorMinor[1] = 0;
+            CALL_GetMapiv(GET_DISPATCH(), (target, GL_ORDER, majorMinor));
+            /*
+             ** The query above might fail, but then majorMinor will be zeroes
+             */
+            return majorMinor[0] * majorMinor[1] * k;
+        case GL_DOMAIN:
+            return 4;
+        case GL_ORDER:
+            return 2;
+        }
+        break;
     }
     return -1;
 }
 
-GLint __glGetMapdv_size(GLenum target, GLenum query)
+GLint
+__glGetMapdv_size(GLenum target, GLenum query)
 {
     return __glGetMap_size(target, query);
 }
 
-GLint __glGetMapfv_size(GLenum target, GLenum query)
+GLint
+__glGetMapfv_size(GLenum target, GLenum query)
 {
     return __glGetMap_size(target, query);
 }
 
-GLint __glGetMapiv_size(GLenum target, GLenum query)
+GLint
+__glGetMapiv_size(GLenum target, GLenum query)
 {
     return __glGetMap_size(target, query);
 }
 
-GLint __glGetPixelMap_size(GLenum map)
+GLint
+__glGetPixelMap_size(GLenum map)
 {
     GLint size;
     GLenum query;
 
     switch (map) {
-      case GL_PIXEL_MAP_I_TO_I:
-	query = GL_PIXEL_MAP_I_TO_I_SIZE;
-	break;
-      case GL_PIXEL_MAP_S_TO_S:
-	query = GL_PIXEL_MAP_S_TO_S_SIZE;
-	break;
-      case GL_PIXEL_MAP_I_TO_R:
-	query = GL_PIXEL_MAP_I_TO_R_SIZE;
-	break;
-      case GL_PIXEL_MAP_I_TO_G:
-	query = GL_PIXEL_MAP_I_TO_G_SIZE;
-	break;
-      case GL_PIXEL_MAP_I_TO_B:
-	query = GL_PIXEL_MAP_I_TO_B_SIZE;
-	break;
-      case GL_PIXEL_MAP_I_TO_A:
-	query = GL_PIXEL_MAP_I_TO_A_SIZE;
-	break;
-      case GL_PIXEL_MAP_R_TO_R:
-	query = GL_PIXEL_MAP_R_TO_R_SIZE;
-	break;
-      case GL_PIXEL_MAP_G_TO_G:
-	query = GL_PIXEL_MAP_G_TO_G_SIZE;
-	break;
-      case GL_PIXEL_MAP_B_TO_B:
-	query = GL_PIXEL_MAP_B_TO_B_SIZE;
-	break;
-      case GL_PIXEL_MAP_A_TO_A:
-	query = GL_PIXEL_MAP_A_TO_A_SIZE;
-	break;
-      default:
-	return -1;
+    case GL_PIXEL_MAP_I_TO_I:
+        query = GL_PIXEL_MAP_I_TO_I_SIZE;
+        break;
+    case GL_PIXEL_MAP_S_TO_S:
+        query = GL_PIXEL_MAP_S_TO_S_SIZE;
+        break;
+    case GL_PIXEL_MAP_I_TO_R:
+        query = GL_PIXEL_MAP_I_TO_R_SIZE;
+        break;
+    case GL_PIXEL_MAP_I_TO_G:
+        query = GL_PIXEL_MAP_I_TO_G_SIZE;
+        break;
+    case GL_PIXEL_MAP_I_TO_B:
+        query = GL_PIXEL_MAP_I_TO_B_SIZE;
+        break;
+    case GL_PIXEL_MAP_I_TO_A:
+        query = GL_PIXEL_MAP_I_TO_A_SIZE;
+        break;
+    case GL_PIXEL_MAP_R_TO_R:
+        query = GL_PIXEL_MAP_R_TO_R_SIZE;
+        break;
+    case GL_PIXEL_MAP_G_TO_G:
+        query = GL_PIXEL_MAP_G_TO_G_SIZE;
+        break;
+    case GL_PIXEL_MAP_B_TO_B:
+        query = GL_PIXEL_MAP_B_TO_B_SIZE;
+        break;
+    case GL_PIXEL_MAP_A_TO_A:
+        query = GL_PIXEL_MAP_A_TO_A_SIZE;
+        break;
+    default:
+        return -1;
     }
-    CALL_GetIntegerv( GET_DISPATCH(), (query, &size) );
+    CALL_GetIntegerv(GET_DISPATCH(), (query, &size));
     return size;
 }
 
-GLint __glGetPixelMapfv_size(GLenum map)
+GLint
+__glGetPixelMapfv_size(GLenum map)
 {
     return __glGetPixelMap_size(map);
 }
 
-GLint __glGetPixelMapuiv_size(GLenum map)
+GLint
+__glGetPixelMapuiv_size(GLenum map)
 {
     return __glGetPixelMap_size(map);
 }
 
-GLint __glGetPixelMapusv_size(GLenum map)
+GLint
+__glGetPixelMapusv_size(GLenum map)
 {
     return __glGetPixelMap_size(map);
 }
 
-GLint __glGetTexImage_size(GLenum target, GLint level, GLenum format,
-			   GLenum type, GLint width, GLint height, GLint depth)
+GLint
+__glGetTexImage_size(GLenum target, GLint level, GLenum format,
+                     GLenum type, GLint width, GLint height, GLint depth)
 {
-    return __glXImageSize( format, type, target, width, height, depth,
-			   0, 0, 0, 0, 4 );
+    return __glXImageSize(format, type, target, width, height, depth,
+                          0, 0, 0, 0, 4);
 }