Ye-old pgindent run. Same 4-space tabs.

10 files changed, 60 insertions, 58 deletions

diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index dd0aa92e40d..8c3c7a75fd4 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -152,7 +152,7 @@ typedef struct GISTENTRY
 ** macro to initialize a GISTENTRY
 */
 #define gistentryinit(e, pr, r, pg, o, b, l)\
-   {(e).pred = pr; (e).rel = r; (e).page = pg; (e).offset = o; (e).bytes = b; (e).leafkey = l;}
+   do {(e).pred = pr; (e).rel = r; (e).page = pg; (e).offset = o; (e).bytes = b; (e).leafkey = l;} while (0)
 
 /* defined in gist.c */
 #define TRLOWER(tr) (((tr)->bytes))
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index d5d7a3c5ace..dae57528c71 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heapam.h,v 1.51 2000/01/26 05:57:50 momjian Exp $
+ * $Id: heapam.h,v 1.52 2000/04/12 17:16:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -261,7 +261,7 @@ extern ItemPointer heap_get_latest_tid(Relation relation, Snapshot snapshot, Ite
 extern Oid	heap_insert(Relation relation, HeapTuple tup);
 extern int	heap_delete(Relation relation, ItemPointer tid, ItemPointer ctid);
 extern int heap_update(Relation relation, ItemPointer otid, HeapTuple tup,
-			 ItemPointer ctid);
+			ItemPointer ctid);
 extern int	heap_mark4update(Relation relation, HeapTuple tup, Buffer *userbuf);
 extern void heap_markpos(HeapScanDesc scan);
 extern void heap_restrpos(HeapScanDesc scan);
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 4337d541f14..784c5051a93 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: htup.h,v 1.28 2000/01/26 05:57:50 momjian Exp $
+ * $Id: htup.h,v 1.29 2000/04/12 17:16:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,15 +81,15 @@ extern long heap_sysoffset[];
  *	  he have to add something below...
  *
  * Change for 7.0:
- *    Up to now t_data could be NULL, the memory location directly following
- *    HeapTupleData or pointing into a buffer. Now, it could also point to
- *    a separate allocation that was done in the t_datamcxt memory context.
+ *	  Up to now t_data could be NULL, the memory location directly following
+ *	  HeapTupleData or pointing into a buffer. Now, it could also point to
+ *	  a separate allocation that was done in the t_datamcxt memory context.
  */
 typedef struct HeapTupleData
 {
 	uint32		t_len;			/* length of *t_data */
 	ItemPointerData t_self;		/* SelfItemPointer */
-	MemoryContext   t_datamcxt; /* */
+	MemoryContext t_datamcxt;	/* */
 	HeapTupleHeader t_data;		/* */
 } HeapTupleData;
 
@@ -127,9 +127,9 @@ typedef HeapTupleData *HeapTuple;
 #define HEAP_HASVARLENA			0x0002	/* has variable length
 										 * attribute(s) */
 #define HEAP_HASEXTERNAL		0x0004	/* has external stored */
-										/* attribute(s) */
+ /* attribute(s) */
 #define HEAP_HASCOMPRESSED		0x0008	/* has compressed stored */
-										/* attribute(s) */
+ /* attribute(s) */
 #define HEAP_HASEXTENDED		0x000C	/* the two above combined */
 #define HEAP_XMIN_COMMITTED		0x0100	/* t_xmin committed */
 #define HEAP_XMIN_INVALID		0x0200	/* t_xmin invalid/aborted */
diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h
index 808a98c8638..50d688d5124 100644
--- a/src/include/access/ibit.h
+++ b/src/include/access/ibit.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ibit.h,v 1.12 2000/01/26 05:57:50 momjian Exp $
+ * $Id: ibit.h,v 1.13 2000/04/12 17:16:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@
 
 typedef struct IndexAttributeBitMapData
 {
-	bits8		bits[(INDEX_MAX_KEYS + 8 - 1)/8];
+	bits8		bits[(INDEX_MAX_KEYS + 8 - 1) / 8];
 } IndexAttributeBitMapData;
 
 typedef IndexAttributeBitMapData *IndexAttributeBitMap;
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 7262402dcb9..94d27b1a230 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.34 2000/02/18 06:32:28 tgl Exp $
+ * $Id: nbtree.h,v 1.35 2000/04/12 17:16:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -204,11 +204,11 @@ typedef struct BTPageState
  * prototypes for functions in nbtinsert.c
  */
 extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem,
-									  bool index_is_unique, Relation heapRel);
+			 bool index_is_unique, Relation heapRel);
 extern int32 _bt_tuplecompare(Relation rel, Size keysz, ScanKey scankey,
-							  IndexTuple tuple1, IndexTuple tuple2);
+				 IndexTuple tuple1, IndexTuple tuple2);
 extern bool _bt_itemcmp(Relation rel, Size keysz, ScanKey scankey,
-						BTItem item1, BTItem item2, StrategyNumber strat);
+			BTItem item1, BTItem item2, StrategyNumber strat);
 
 /*
  * prototypes for functions in nbtpage.c
@@ -272,7 +272,7 @@ extern bool _bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir);
  * prototypes for functions in nbtstrat.c
  */
 extern StrategyNumber _bt_getstrat(Relation rel, AttrNumber attno,
-								   RegProcedure proc);
+			 RegProcedure proc);
 
 /*
  * prototypes for functions in nbtutils.c
@@ -289,7 +289,7 @@ extern BTItem _bt_formitem(IndexTuple itup);
  * prototypes for functions in nbtsort.c
  */
 
-typedef struct BTSpool BTSpool;	/* opaque type known only within nbtsort.c */
+typedef struct BTSpool BTSpool; /* opaque type known only within nbtsort.c */
 
 extern BTSpool *_bt_spoolinit(Relation index, bool isunique);
 extern void _bt_spooldestroy(BTSpool *btspool);
diff --git a/src/include/access/rmgr.h b/src/include/access/rmgr.h
index d8bde166c2c..b2796985948 100644
--- a/src/include/access/rmgr.h
+++ b/src/include/access/rmgr.h
@@ -8,7 +8,7 @@
 #ifndef RMGR_H
 #define RMGR_H
 
-typedef uint8	RmgrId;
+typedef uint8 RmgrId;
 
 typedef struct RmgrData
 {
@@ -17,18 +17,18 @@ typedef struct RmgrData
 	char	   *(*rm_undo) ();	/* UNDO(XLogRecPtr rptr) */
 } RmgrData;
 
-extern RmgrData	   *RmgrTable;
+extern RmgrData *RmgrTable;
 
 /*
  * Built-in resource managers
  */
-#define	RM_XLOG_ID				0
-#define	RM_XACT_ID				1
-#define	RM_HEAP_ID				2
-#define	RM_BTREE_ID				3
-#define	RM_HASH_ID				4
-#define	RM_RTREE_ID				5
-#define	RM_GIST_ID				6
-#define	RM_MAX_ID				RM_GIST_ID
+#define RM_XLOG_ID				0
+#define RM_XACT_ID				1
+#define RM_HEAP_ID				2
+#define RM_BTREE_ID				3
+#define RM_HASH_ID				4
+#define RM_RTREE_ID				5
+#define RM_GIST_ID				6
+#define RM_MAX_ID				RM_GIST_ID
 
 #endif	 /* RMGR_H */
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index 26a59180cc2..9406b88ac3d 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: strat.h,v 1.17 2000/01/26 05:57:51 momjian Exp $
+ * $Id: strat.h,v 1.18 2000/04/12 17:16:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,6 +35,8 @@ typedef struct StrategyTransformMapData
 								 *
 								 *
 								 *
+								 *
+								 *
 								 * STRUCTURE */
 
 typedef StrategyTransformMapData *StrategyTransformMap;
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index 525cd6267e1..dbdc27931a5 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tupdesc.h,v 1.27 2000/01/31 04:35:54 tgl Exp $
+ * $Id: tupdesc.h,v 1.28 2000/04/12 17:16:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,7 +51,7 @@ typedef struct tupleDesc
 	Form_pg_attribute *attrs;
 	/* attrs[N] is a pointer to the description of Attribute Number N+1.  */
 	TupleConstr *constr;
-} *TupleDesc;
+}		   *TupleDesc;
 
 extern TupleDesc CreateTemplateTupleDesc(int natts);
 
diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h
index dedc770db22..9c4f1a50578 100644
--- a/src/include/access/tuptoaster.h
+++ b/src/include/access/tuptoaster.h
@@ -2,11 +2,11 @@
  *
  * tuptoaster.h
  *	  POSTGRES definitions for external and compressed storage
- *    of variable size attributes.
+ *	  of variable size attributes.
  *
  * Copyright (c) 2000, PostgreSQL Development Team
  *
- * $Id: tuptoaster.h,v 1.1 1999/12/21 00:06:42 wieck Exp $
+ * $Id: tuptoaster.h,v 1.2 2000/04/12 17:16:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,12 +22,12 @@
 #include "utils/rel.h"
 
 
-extern void heap_tuple_toast_attrs(Relation rel, 
-				HeapTuple newtup, HeapTuple oldtup);
+extern void heap_tuple_toast_attrs(Relation rel,
+					   HeapTuple newtup, HeapTuple oldtup);
 
-extern varattrib *heap_tuple_untoast_attr(varattrib *attr);
+extern varattrib *heap_tuple_untoast_attr(varattrib * attr);
 
-#endif /* TUPLE_TOASTER_ACTIVE */
+#endif	 /* TUPLE_TOASTER_ACTIVE */
 
 
 #endif	 /* TUPTOASTER_H */
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index 5c8c0754246..e2ab6e4f417 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -13,43 +13,43 @@
 
 typedef struct XLogRecPtr
 {
-	uint32		xlogid;		/* log file #, 0 based */
-	uint32		xrecoff;	/* offset of record in log file */
+	uint32		xlogid;			/* log file #, 0 based */
+	uint32		xrecoff;		/* offset of record in log file */
 } XLogRecPtr;
 
 typedef struct XLogRecord
 {
-	XLogRecPtr		xl_prev;		/* ptr to previous record in log */
-	XLogRecPtr		xl_xact_prev;	/* ptr to previous record of this xact */
-	TransactionId	xl_xid;			/* xact id */
-	uint16			xl_len;			/* len of record on this page */
-	uint8			xl_info;
-	RmgrId			xl_rmid;		/* resource manager inserted this record */
+	XLogRecPtr	xl_prev;		/* ptr to previous record in log */
+	XLogRecPtr	xl_xact_prev;	/* ptr to previous record of this xact */
+	TransactionId xl_xid;		/* xact id */
+	uint16		xl_len;			/* len of record on this page */
+	uint8		xl_info;
+	RmgrId		xl_rmid;		/* resource manager inserted this record */
 
 	/* ACTUAL LOG DATA FOLLOWS AT END OF STRUCT */
 
 } XLogRecord;
 
-#define	SizeOfXLogRecord	DOUBLEALIGN(sizeof(XLogRecord))
-#define	MAXLOGRECSZ			(2 * BLCKSZ)
+#define SizeOfXLogRecord	DOUBLEALIGN(sizeof(XLogRecord))
+#define MAXLOGRECSZ			(2 * BLCKSZ)
 /*
  * When there is no space on current page we continue on the next
  * page with subrecord.
  */
 typedef struct XLogSubRecord
 {
-	uint16			xl_len;
-	uint8			xl_info;
+	uint16		xl_len;
+	uint8		xl_info;
 
 	/* ACTUAL LOG DATA FOLLOWS AT END OF STRUCT */
 
 } XLogSubRecord;
 
-#define	SizeOfXLogSubRecord	DOUBLEALIGN(sizeof(XLogSubRecord))
+#define SizeOfXLogSubRecord DOUBLEALIGN(sizeof(XLogSubRecord))
 
-#define	XLR_TO_BE_CONTINUED		0x01
+#define XLR_TO_BE_CONTINUED		0x01
 
-#define	XLOG_PAGE_MAGIC	0x17345168
+#define XLOG_PAGE_MAGIC 0x17345168
 
 typedef struct XLogPageHeaderData
 {
@@ -57,14 +57,14 @@ typedef struct XLogPageHeaderData
 	uint16		xlp_info;
 } XLogPageHeaderData;
 
-#define	SizeOfXLogPHD	DOUBLEALIGN(sizeof(XLogPageHeaderData))
+#define SizeOfXLogPHD	DOUBLEALIGN(sizeof(XLogPageHeaderData))
 
 typedef XLogPageHeaderData *XLogPageHeader;
 
-#define	XLP_FIRST_IS_SUBRECORD	0x0001
+#define XLP_FIRST_IS_SUBRECORD	0x0001
 
-extern XLogRecPtr		XLogInsert(RmgrId rmid, char *hdr, uint32 hdrlen, 
-									char *buf, uint32 buflen);
-extern void				XLogFlush(XLogRecPtr RecPtr);
+extern XLogRecPtr XLogInsert(RmgrId rmid, char *hdr, uint32 hdrlen,
+		   char *buf, uint32 buflen);
+extern void XLogFlush(XLogRecPtr RecPtr);
 
-#endif	/* XLOG_H */
+#endif	 /* XLOG_H */