8.4 pgindent run, with new combined Linux/FreeBSD/MinGW typedef list

provided by Andrew.

1 files changed, 18 insertions, 18 deletions

diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h
index 9cdfedab04..f16c6f9a32 100644
--- a/contrib/ltree/ltree.h
+++ b/contrib/ltree/ltree.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/ltree/ltree.h,v 1.21 2008/06/30 18:30:48 teodor Exp $ */
+/* $PostgreSQL: pgsql/contrib/ltree/ltree.h,v 1.22 2009/06/11 14:48:51 momjian Exp $ */
 
 #ifndef __LTREE_H__
 #define __LTREE_H__
@@ -11,7 +11,7 @@ typedef struct
 {
 	uint16		len;
 	char		name[1];
-}	ltree_level;
+} ltree_level;
 
 #define LEVEL_HDRSIZE	(offsetof(ltree_level,name))
 #define LEVEL_NEXT(x)	( (ltree_level*)( ((char*)(x)) + MAXALIGN(((ltree_level*)(x))->len + LEVEL_HDRSIZE) ) )
@@ -21,7 +21,7 @@ typedef struct
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
 	uint16		numlevel;
 	char		data[1];
-}	ltree;
+} ltree;
 
 #define LTREE_HDRSIZE	MAXALIGN( offsetof(ltree, data) )
 #define LTREE_FIRST(x)	( (ltree_level*)( ((char*)(x))+LTREE_HDRSIZE ) )
@@ -35,7 +35,7 @@ typedef struct
 	uint16		len;
 	uint8		flag;
 	char		name[1];
-}	lquery_variant;
+} lquery_variant;
 
 #define LVAR_HDRSIZE   MAXALIGN(offsetof(lquery_variant, name))
 #define LVAR_NEXT(x)	( (lquery_variant*)( ((char*)(x)) + MAXALIGN(((lquery_variant*)(x))->len) + LVAR_HDRSIZE ) )
@@ -52,7 +52,7 @@ typedef struct
 	uint16		low;
 	uint16		high;
 	char		variants[1];
-}	lquery_level;
+} lquery_level;
 
 #define LQL_HDRSIZE MAXALIGN( offsetof(lquery_level,variants) )
 #define LQL_NEXT(x) ( (lquery_level*)( ((char*)(x)) + MAXALIGN(((lquery_level*)(x))->totallen) ) )
@@ -73,14 +73,14 @@ typedef struct
 	uint16		firstgood;
 	uint16		flag;
 	char		data[1];
-}	lquery;
+} lquery;
 
 #define LQUERY_HDRSIZE	 MAXALIGN( offsetof(lquery, data) )
 #define LQUERY_FIRST(x)   ( (lquery_level*)( ((char*)(x))+LQUERY_HDRSIZE ) )
 
 #define LQUERY_HASNOT		0x01
 
-#define ISALNUM(x)	( t_isalpha(x) || t_isdigit(x)  || ( pg_mblen(x) == 1 && t_iseq((x), '_') ) )
+#define ISALNUM(x)	( t_isalpha(x) || t_isdigit(x)	|| ( pg_mblen(x) == 1 && t_iseq((x), '_') ) )
 
 /* full text query */
 
@@ -97,7 +97,7 @@ typedef struct ITEM
 	/* user-friendly value */
 	uint8		length;
 	uint16		distance;
-}	ITEM;
+} ITEM;
 
 /*
  *Storage:
@@ -108,7 +108,7 @@ typedef struct
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
 	int4		size;
 	char		data[1];
-}	ltxtquery;
+} ltxtquery;
 
 #define HDRSIZEQT		MAXALIGN(VARHDRSZ + sizeof(int4))
 #define COMPUTESIZE(size,lenofoperand)	( HDRSIZEQT + (size) * sizeof(ITEM) + (lenofoperand) )
@@ -153,15 +153,15 @@ Datum		ltree_textadd(PG_FUNCTION_ARGS);
 /* Util function */
 Datum		ltree_in(PG_FUNCTION_ARGS);
 
-bool ltree_execute(ITEM * curitem, void *checkval,
-			  bool calcnot, bool (*chkcond) (void *checkval, ITEM * val));
+bool ltree_execute(ITEM *curitem, void *checkval,
+			  bool calcnot, bool (*chkcond) (void *checkval, ITEM *val));
 
-int			ltree_compare(const ltree * a, const ltree * b);
-bool		inner_isparent(const ltree * c, const ltree * p);
-bool 		compare_subnode(ltree_level * t, char *q, int len,
-					int (*cmpptr) (const char *, const char *, size_t), bool anyend);
-ltree	   *lca_inner(ltree ** a, int len);
-int 		ltree_strncasecmp(const char *a, const char *b, size_t s);
+int			ltree_compare(const ltree *a, const ltree *b);
+bool		inner_isparent(const ltree *c, const ltree *p);
+bool compare_subnode(ltree_level *t, char *q, int len,
+			int (*cmpptr) (const char *, const char *, size_t), bool anyend);
+ltree	   *lca_inner(ltree **a, int len);
+int			ltree_strncasecmp(const char *a, const char *b, size_t s);
 
 #define PG_GETARG_LTREE(x)	((ltree*)DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(x))))
 #define PG_GETARG_LTREE_COPY(x) ((ltree*)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(x))))
@@ -207,7 +207,7 @@ typedef struct
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
 	uint32		flag;
 	char		data[1];
-}	ltree_gist;
+} ltree_gist;
 
 #define LTG_ONENODE 0x01
 #define LTG_ALLTRUE 0x02