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, 53 insertions, 54 deletions

diff --git a/include/closestr.h b/include/closestr.h
index ab18ef9e5..c6aa1295f 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -26,7 +26,6 @@ from The Open Group.
 
 */
 
-
 #ifndef CLOSESTR_H
 #define CLOSESTR_H
 
@@ -41,87 +40,87 @@ from The Open Group.
 /* OpenFont */
 
 typedef struct _OFclosure {
-    ClientPtr   client;
-    short       current_fpe;
-    short       num_fpes;
+    ClientPtr client;
+    short current_fpe;
+    short num_fpes;
     FontPathElementPtr *fpe_list;
-    Mask        flags;
+    Mask flags;
 
 /* XXX -- get these from request buffer instead? */
-    char       *origFontName;
-    int		origFontNameLen;
-    XID         fontid;
-    char       *fontname;
-    int         fnamelen;
-    FontPtr	non_cachable_font;
-}           OFclosureRec;
+    char *origFontName;
+    int origFontNameLen;
+    XID fontid;
+    char *fontname;
+    int fnamelen;
+    FontPtr non_cachable_font;
+} OFclosureRec;
 
 /* ListFontsWithInfo */
 
 #define XLFDMAXFONTNAMELEN	256
 typedef struct _LFWIstate {
-    char	pattern[XLFDMAXFONTNAMELEN];
-    int		patlen;
-    int		current_fpe;
-    int		max_names;
-    Bool	list_started;
-    pointer	private;
+    char pattern[XLFDMAXFONTNAMELEN];
+    int patlen;
+    int current_fpe;
+    int max_names;
+    Bool list_started;
+    pointer private;
 } LFWIstateRec, *LFWIstatePtr;
 
 typedef struct _LFWIclosure {
-    ClientPtr		client;
-    int			num_fpes;
-    FontPathElementPtr	*fpe_list;
+    ClientPtr client;
+    int num_fpes;
+    FontPathElementPtr *fpe_list;
     xListFontsWithInfoReply *reply;
-    int			length;
-    LFWIstateRec	current;
-    LFWIstateRec	saved;
-    int			savedNumFonts;
-    Bool		haveSaved;
-    char		*savedName;
+    int length;
+    LFWIstateRec current;
+    LFWIstateRec saved;
+    int savedNumFonts;
+    Bool haveSaved;
+    char *savedName;
 } LFWIclosureRec;
 
 /* ListFonts */
 
 typedef struct _LFclosure {
-    ClientPtr   client;
-    int         num_fpes;
+    ClientPtr client;
+    int num_fpes;
     FontPathElementPtr *fpe_list;
     FontNamesPtr names;
     LFWIstateRec current;
     LFWIstateRec saved;
-    Bool        haveSaved;
-    char	*savedName;
-    int		savedNameLen;
-}	LFclosureRec;
+    Bool haveSaved;
+    char *savedName;
+    int savedNameLen;
+} LFclosureRec;
 
 /* PolyText */
 
 typedef struct _PTclosure {
-    ClientPtr		client;
-    DrawablePtr		pDraw;
-    GC			*pGC;
-    unsigned char	*pElt;
-    unsigned char	*endReq;
-    unsigned char	*data;
-    int			xorg;
-    int			yorg;
-    CARD8		reqType;
-    XID			did;
-    int			err;
+    ClientPtr client;
+    DrawablePtr pDraw;
+    GC *pGC;
+    unsigned char *pElt;
+    unsigned char *endReq;
+    unsigned char *data;
+    int xorg;
+    int yorg;
+    CARD8 reqType;
+    XID did;
+    int err;
 } PTclosureRec;
 
 /* ImageText */
 
 typedef struct _ITclosure {
-    ClientPtr		client;
-    DrawablePtr		pDraw;
-    GC			*pGC;
-    BYTE		nChars;
-    unsigned char	*data;
-    int			xorg;
-    int			yorg;
-    CARD8		reqType;
-    XID			did;
+    ClientPtr client;
+    DrawablePtr pDraw;
+    GC *pGC;
+    BYTE nChars;
+    unsigned char *data;
+    int xorg;
+    int yorg;
+    CARD8 reqType;
+    XID did;
 } ITclosureRec;
-#endif				/* CLOSESTR_H */
+#endif                          /* CLOSESTR_H */