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, 50 insertions, 55 deletions

diff --git a/include/xkbrules.h b/include/xkbrules.h
index 0f3f93490..d21731884 100644
--- a/include/xkbrules.h
+++ b/include/xkbrules.h
@@ -30,41 +30,41 @@
 /***====================================================================***/
 
 typedef struct _XkbRMLVOSet {
-        char *                  rules;
-        char *                  model;
-        char *                  layout;
-        char *                  variant;
-        char *                  options;
+    char *rules;
+    char *model;
+    char *layout;
+    char *variant;
+    char *options;
 } XkbRMLVOSet;
 
 typedef struct _XkbRF_VarDefs {
-	char *			model;
-	char *			layout;
-	char *			variant;
-	char *			options;
-} XkbRF_VarDefsRec,*XkbRF_VarDefsPtr;
+    char *model;
+    char *layout;
+    char *variant;
+    char *options;
+} XkbRF_VarDefsRec, *XkbRF_VarDefsPtr;
 
 typedef struct _XkbRF_Rule {
-	int			number;
-        int			layout_num;
-        int			variant_num;
-	char *			model;
-	char *			layout;
-	char *			variant;
-	char *			option;
-	/* yields */
-	char *			keycodes;
-	char *			symbols;
-	char *			types;
-	char *			compat;
-	char *			geometry;
-	unsigned		flags;
-} XkbRF_RuleRec,*XkbRF_RulePtr;
+    int number;
+    int layout_num;
+    int variant_num;
+    char *model;
+    char *layout;
+    char *variant;
+    char *option;
+    /* yields */
+    char *keycodes;
+    char *symbols;
+    char *types;
+    char *compat;
+    char *geometry;
+    unsigned flags;
+} XkbRF_RuleRec, *XkbRF_RulePtr;
 
 typedef struct _XkbRF_Group {
-	int			number;
-	char *			name;
-	char *			words;
+    int number;
+    char *name;
+    char *words;
 } XkbRF_GroupRec, *XkbRF_GroupPtr;
 
 #define	XkbRF_PendingMatch	(1L<<1)
@@ -74,12 +74,12 @@ typedef struct _XkbRF_Group {
 #define	XkbRF_Invalid		(1L<<5)
 
 typedef struct _XkbRF_Rules {
-	unsigned short		sz_rules;
-	unsigned short		num_rules;
-	XkbRF_RulePtr		rules;
-	unsigned short		sz_groups;
-	unsigned short		num_groups;
-        XkbRF_GroupPtr		groups;
+    unsigned short sz_rules;
+    unsigned short num_rules;
+    XkbRF_RulePtr rules;
+    unsigned short sz_groups;
+    unsigned short num_groups;
+    XkbRF_GroupPtr groups;
 } XkbRF_RulesRec, *XkbRF_RulesPtr;
 
 /***====================================================================***/
@@ -87,33 +87,29 @@ typedef struct _XkbRF_Rules {
 _XFUNCPROTOBEGIN
 
 /* Seems preferable to dragging xkbstr.h in. */
-struct _XkbComponentNames;
+    struct _XkbComponentNames;
 
-extern _X_EXPORT Bool	XkbRF_GetComponents(
-    XkbRF_RulesPtr		/* rules */,
-    XkbRF_VarDefsPtr		/* var_defs */,
-    struct _XkbComponentNames *	/* names */
-);
+extern _X_EXPORT Bool XkbRF_GetComponents(XkbRF_RulesPtr /* rules */ ,
+                                          XkbRF_VarDefsPtr /* var_defs */ ,
+                                          struct _XkbComponentNames *   /* names */
+    );
 
-extern _X_EXPORT Bool	XkbRF_LoadRules(
-    FILE *		/* file */,
-    XkbRF_RulesPtr	/* rules */
-);
+extern _X_EXPORT Bool XkbRF_LoadRules(FILE * /* file */ ,
+                                      XkbRF_RulesPtr    /* rules */
+    );
 
-extern _X_EXPORT Bool XkbRF_LoadRulesByName(
-    char *		/* base */,
-    char *		/* locale */,
-    XkbRF_RulesPtr	/* rules */
-);
+extern _X_EXPORT Bool XkbRF_LoadRulesByName(char * /* base */ ,
+                                            char * /* locale */ ,
+                                            XkbRF_RulesPtr      /* rules */
+    );
 
 /***====================================================================***/
 
 extern _X_EXPORT XkbRF_RulesPtr XkbRF_Create(void);
 
-extern _X_EXPORT void XkbRF_Free(
-    XkbRF_RulesPtr	/* rules */,
-    Bool		/* freeRules */
-);
+extern _X_EXPORT void XkbRF_Free(XkbRF_RulesPtr /* rules */ ,
+                                 Bool   /* freeRules */
+    );
 
 /***====================================================================***/
 
@@ -121,5 +117,4 @@ extern _X_EXPORT void XkbRF_Free(
 #define	_XKB_RF_NAMES_PROP_MAXLEN	1024
 
 _XFUNCPROTOEND
-
-#endif /* _XKBRULES_H_ */
+#endif                          /* _XKBRULES_H_ */