Renaming cleanup, no pgindent yet.

33 files changed, 119 insertions, 128 deletions

diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 1494665b33e..7885d1cd0d9 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: genam.h,v 1.14 1998/08/19 02:03:35 momjian Exp $
+ * $Id: genam.h,v 1.15 1998/09/01 03:27:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@ index_getprocid(Relation irel, AttrNumber attnum,
 				uint16 procnum);
 extern Datum
 GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc,
-			  int attOff, AttrNumber attrNums[], FuncIndexInfo *fInfo,
+			  int attOff, AttrNumber *attrNums, FuncIndexInfo *fInfo,
 			  bool *attNull);
 
 /* in genam.c */
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 4c21adde10e..bbc34dbb810 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hash.h,v 1.17 1998/08/19 02:03:37 momjian Exp $
+ * $Id: hash.h,v 1.18 1998/09/01 03:27:31 momjian Exp $
  *
  * NOTES
  *		modeled after Margo Seltzer's hash implementation for unix.
@@ -271,7 +271,7 @@ extern uint32 hashint4(uint32 key);
 extern uint32 hashfloat4(float32 keyp);
 extern uint32 hashfloat8(float64 keyp);
 extern uint32 hashoid(Oid key);
-extern uint32 hashoid8(Oid key[]);
+extern uint32 hashoid8(Oid *key);
 extern uint32 hashchar(char key);
 extern uint32 hashtext(struct varlena * key);
 extern uint32 hashname(NameData *n);
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 777f1acbe3e..f8e05b60cf6 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heapam.h,v 1.35 1998/08/19 02:03:39 momjian Exp $
+ * $Id: heapam.h,v 1.36 1998/09/01 03:27:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -262,10 +262,10 @@ extern void heap_markpos(HeapScanDesc scan);
 extern void heap_restrpos(HeapScanDesc scan);
 
 /* in common/heaptuple.c */
-extern Size ComputeDataSize(TupleDesc tupleDesc, Datum value[], char nulls[]);
+extern Size ComputeDataSize(TupleDesc tupleDesc, Datum *value, char *nulls);
 extern void
 DataFill(char *data, TupleDesc tupleDesc,
-		 Datum value[], char nulls[], uint16 *infomask,
+		 Datum *value, char *nulls, uint16 *infomask,
 		 bits8 *bit);
 extern int	heap_attisnull(HeapTuple tup, int attnum);
 extern int	heap_sysattrlen(AttrNumber attno);
@@ -277,10 +277,10 @@ nocachegetattr(HeapTuple tup, int attnum,
 extern HeapTuple heap_copytuple(HeapTuple tuple);
 extern HeapTuple
 heap_formtuple(TupleDesc tupleDescriptor,
-			   Datum value[], char nulls[]);
+			   Datum *value, char *nulls);
 extern HeapTuple
 heap_modifytuple(HeapTuple tuple,
-		Relation relation, Datum replValue[], char replNull[], char repl[]);
+		Relation relation, Datum *replValue, char *replNull, char *repl);
 HeapTuple	heap_addheader(uint32 natts, int structlen, char *structure);
 
 /* in common/heap/stats.c */
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 40d26f3feb1..9b02b6a937f 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itup.h,v 1.14 1998/06/15 18:39:54 momjian Exp $
+ * $Id: itup.h,v 1.15 1998/09/01 03:27:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -162,7 +162,7 @@ typedef struct PredInfo
 /* indextuple.h */
 extern IndexTuple
 index_formtuple(TupleDesc tupleDescriptor,
-				Datum value[], char null[]);
+				Datum *value, char *null);
 extern Datum
 nocache_index_getattr(IndexTuple tup, int attnum,
 					  TupleDesc tupleDesc, bool *isnull);
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index 402bab9229d..050fba81f5d 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tupdesc.h,v 1.18 1998/08/19 02:03:40 momjian Exp $
+ * $Id: tupdesc.h,v 1.19 1998/09/01 03:27:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,14 +50,14 @@ typedef struct tupleDesc
 {
 	int			natts;
 	/* Number of attributes in the tuple */
-	AttributeTupleForm *attrs;
+	Form_pg_attribute *attrs;
 	/* attrs[N] is a pointer to the description of Attribute Number N+1.  */
 	TupleConstr *constr;
 } *TupleDesc;
 
 extern TupleDesc CreateTemplateTupleDesc(int natts);
 
-extern TupleDesc CreateTupleDesc(int natts, AttributeTupleForm *attrs);
+extern TupleDesc CreateTupleDesc(int natts, Form_pg_attribute *attrs);
 
 extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc);
 
diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 173ac2cdcbe..f81987f3823 100644
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tupmacs.h,v 1.4 1998/02/26 04:40:31 momjian Exp $
+ * $Id: tupmacs.h,v 1.5 1998/09/01 03:27:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@
 #define att_isnull(ATT, BITS) (!((BITS)[(ATT) >> 3] & (1 << ((ATT) & 0x07))))
 
 /*
- * given a AttributeTupleForm and a pointer into a tuple's data
+ * given a Form_pg_attribute and a pointer into a tuple's data
  * area, return the correct value or pointer.
  *
  * We return a 4 byte (char *) value in all cases.	If the attribute has
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index fe874512694..2eeed643fb7 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: valid.h,v 1.13 1998/01/31 04:39:24 momjian Exp $
+ * $Id: valid.h,v 1.14 1998/09/01 03:27:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -130,7 +130,7 @@ do \
 		_tuple = (HeapTuple) PageGetItem((Page) (disk_page), (itemId)); \
 	 \
 		if ((key) != NULL) \
-			HeapKeyTest(_tuple, RelationGetTupleDescriptor(relation), \
+			HeapKeyTest(_tuple, RelationGetDescr(relation), \
 							   (nKeys), (key), _res); \
 		else \
 			_res = TRUE; \
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index f3546d3f729..e357f9ecc4e 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bootstrap.h,v 1.11 1998/02/26 04:40:35 momjian Exp $
+ * $Id: bootstrap.h,v 1.12 1998/09/01 03:27:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,7 +28,7 @@ typedef struct hashnode
 #define EMITPROMPT printf("> ")
 
 extern Relation reldesc;
-extern AttributeTupleForm attrtypes[MAXATTR];
+extern Form_pg_attribute attrtypes[MAXATTR];
 extern int	numattr;
 extern int	DebugMode;
 
diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index e0b77b4779d..dfa041f4215 100644
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catalog.h,v 1.4 1997/09/08 02:34:39 momjian Exp $
+ * $Id: catalog.h,v 1.5 1998/09/01 03:27:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,7 @@
 
 #include <access/tupdesc.h>
 
-extern char *relpath(char relname[]);
+extern char *relpath(char *relname);
 extern bool IsSystemRelationName(char *relname);
 extern bool IsSharedSystemRelationName(char *relname);
 extern Oid	newoid(void);
diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h
index f3369a3b39a..7f0f91df1ee 100644
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heap.h,v 1.14 1998/08/19 02:03:44 momjian Exp $
+ * $Id: heap.h,v 1.15 1998/09/01 03:27:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@ extern Relation heap_create(char *relname, TupleDesc att);
 extern Oid	heap_create_with_catalog(char *relname,
 									 TupleDesc tupdesc, char relkind);
 
-extern void heap_destroy_with_catalog(char relname[]);
+extern void heap_destroy_with_catalog(char *relname);
 extern void heap_destroy(Relation rel);
 
 extern void InitTempRelList(void);
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index 15d3663a5ad..f4fcce96579 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: index.h,v 1.11 1998/08/19 02:03:45 momjian Exp $
+ * $Id: index.h,v 1.12 1998/09/01 03:27:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@
 #include <access/itup.h>
 #include <access/funcindex.h>
 
-extern Form_pg_am AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId);
+extern Form_pg_am AccessMethodObjectIdGetForm(Oid accessMethodObjectId);
 
 extern void UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate);
 
@@ -34,8 +34,8 @@ index_create(char *heapRelationName,
 			 List *attributeList,
 			 Oid accessMethodObjectId,
 			 int numatts,
-			 AttrNumber attNums[],
-			 Oid classObjectId[],
+			 AttrNumber *attNums,
+			 Oid *classObjectId,
 			 uint16 parameterCount,
 			 Datum *parameter,
 			 Node *predicate,
@@ -46,7 +46,7 @@ extern void index_destroy(Oid indexId);
 
 extern void
 FormIndexDatum(int numberOfAttributes,
-			   AttrNumber attributeNumber[], HeapTuple heapTuple,
+			   AttrNumber *attributeNumber, HeapTuple heapTuple,
 			   TupleDesc heapDescriptor, Datum *datum,
 			   char *nullv, FuncIndexInfoPtr fInfo);
 
@@ -58,7 +58,7 @@ FillDummyExprContext(ExprContext *econtext, TupleTableSlot *slot,
 
 extern void
 index_build(Relation heapRelation, Relation indexRelation,
-			int numberOfAttributes, AttrNumber attributeNumber[],
+			int numberOfAttributes, AttrNumber *attributeNumber,
 		uint16 parameterCount, Datum *parameter, FuncIndexInfo *funcInfo,
 			PredInfo *predInfo);
 
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index 003ae30c0e8..7f0b440a79d 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.16 1998/08/19 02:03:46 momjian Exp $
+ * $Id: indexing.h,v 1.17 1998/09/01 03:27:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,7 +64,7 @@ extern char *IndexedCatalogNames[];
  *
  * Functions for each index to perform the necessary scan on a cache miss.
  */
-extern void CatalogOpenIndices(int nIndices, char *names[], Relation idescs[]);
+extern void CatalogOpenIndices(int nIndices, char **names, Relation *idescs);
 extern void CatalogCloseIndices(int nIndices, Relation *idescs);
 extern void
 CatalogIndexInsert(Relation *idescs,
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index a1edd7774b5..4e4832fe170 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_attribute.h,v 1.41 1998/08/27 05:06:56 momjian Exp $
+ * $Id: pg_attribute.h,v 1.42 1998/09/01 03:27:49 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -56,7 +56,7 @@ CATALOG(pg_attribute) BOOTSTRAP
 
 	/*
 	 * attlen is a copy of the typlen field from pg_type for this
-	 * attribute.  See atttypid above.	See struct TypeTupleFormData for
+	 * attribute.  See atttypid above.	See struct Form_pg_type for
 	 * definition.
 	 */
 	int2		attnum;
@@ -98,7 +98,7 @@ CATALOG(pg_attribute) BOOTSTRAP
 
 	/*
 	 * attbyval is a copy of the typbyval field from pg_type for this
-	 * attribute.  See atttypid above.	See struct TypeTupleFormData for
+	 * attribute.  See atttypid above.	See struct Form_pg_type for
 	 * definition.
 	 */
 	bool		attisset;
@@ -106,7 +106,7 @@ CATALOG(pg_attribute) BOOTSTRAP
 
 	/*
 	 * attalign is a copy of the typalign field from pg_type for this
-	 * attribute.  See atttypid above.	See struct TypeTupleFormData for
+	 * attribute.  See atttypid above.	See struct Form_pg_type for
 	 * definition.
 	 */
 	bool		attnotnull;
@@ -129,7 +129,7 @@ CATALOG(pg_attribute) BOOTSTRAP
  *		the format of pg_attribute relation.
  * ----------------
  */
-typedef FormData_pg_attribute *AttributeTupleForm;
+typedef FormData_pg_attribute *Form_pg_attribute;
 
 /* ----------------
  *		compiler constants for pg_attribute
diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index e849289eef9..ef39b13b7f2 100644
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_index.h,v 1.6 1997/11/21 18:12:09 momjian Exp $
+ * $Id: pg_index.h,v 1.7 1998/09/01 03:27:51 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -63,7 +63,7 @@ CATALOG(pg_index)
  *		the format of pg_index relation.
  * ----------------
  */
-typedef FormData_pg_index *IndexTupleForm;
+typedef FormData_pg_index *Form_pg_index;
 
 /* ----------------
  *		compiler constants for pg_index
diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h
index 7cb1584f5c6..1ad2b782cbd 100644
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_inherits.h,v 1.4 1997/09/08 02:35:14 momjian Exp $
+ * $Id: pg_inherits.h,v 1.5 1998/09/01 03:27:53 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -42,7 +42,7 @@ CATALOG(pg_inherits)
  *		the format of pg_inherits relation.
  * ----------------
  */
-typedef FormData_pg_inherits *InheritsTupleForm;
+typedef FormData_pg_inherits *Form_pg_inherits;
 
 /* ----------------
  *		compiler constants for pg_inherits
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index 9e11a79ed68..526da0883ac 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_operator.h,v 1.34 1998/08/19 02:03:53 momjian Exp $
+ * $Id: pg_operator.h,v 1.35 1998/09/01 03:27:55 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -58,7 +58,7 @@ CATALOG(pg_operator)
  *		the format of pg_operator relation.
  * ----------------
  */
-typedef FormData_pg_operator *OperatorTupleForm;
+typedef FormData_pg_operator *Form_pg_operator;
 
 /* ----------------
  *		compiler constants for pg_operator
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index c7b64a58ceb..9f204bfec1e 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.45 1998/08/27 05:06:57 momjian Exp $
+ * $Id: pg_type.h,v 1.46 1998/09/01 03:27:58 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -106,14 +106,14 @@ CATALOG(pg_type) BOOTSTRAP
 	 * but I doubt it - BRYANH 96.08).
 	 */
 	text		typdefault;		/* VARIABLE LENGTH FIELD */
-} TypeTupleFormData;
+} FormData_pg_type;
 
 /* ----------------
  *		Form_pg_type corresponds to a pointer to a row with
  *		the format of pg_type relation.
  * ----------------
  */
-typedef TypeTupleFormData *TypeTupleForm;
+typedef FormData_pg_type *Form_pg_type;
 
 /* ----------------
  *		compiler constants for pg_type
diff --git a/src/include/catalog/pg_version.h b/src/include/catalog/pg_version.h
index 96b0c2125f1..eaf98ffa0ea 100644
--- a/src/include/catalog/pg_version.h
+++ b/src/include/catalog/pg_version.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_version.h,v 1.5 1997/09/08 02:35:35 momjian Exp $
+ * $Id: pg_version.h,v 1.6 1998/09/01 03:28:00 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -42,7 +42,7 @@ CATALOG(pg_version)
  *		the format of pg_version relation.
  * ----------------
  */
-typedef FormData_pg_version *VersionTupleForm;
+typedef FormData_pg_version *Form_pg_version;
 
 /* ----------------
  *		compiler constants for pg_version
diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h
index 5847d6b3c95..ed89240ae7a 100644
--- a/src/include/commands/cluster.h
+++ b/src/include/commands/cluster.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994-5, Regents of the University of California
  *
- * $Id: cluster.h,v 1.4 1997/09/08 02:35:39 momjian Exp $
+ * $Id: cluster.h,v 1.5 1998/09/01 03:28:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,6 @@
 /*
  * functions
  */
-extern void cluster(char oldrelname[], char oldindexname[]);
+extern void cluster(char *oldrelname, char *oldindexname);
 
 #endif							/* CLUSTER_H */
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index 529d652e64f..47a818fb4be 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: vacuum.h,v 1.14 1998/08/19 19:59:49 momjian Exp $
+ * $Id: vacuum.h,v 1.15 1998/09/01 03:28:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,13 +53,13 @@ typedef struct
 {
 	FuncIndexInfo finfo;
 	FuncIndexInfo *finfoP;
-	IndexTupleForm tform;
+	Form_pg_index tform;
 	int			natts;
 } IndDesc;
 
 typedef struct
 {
-	AttributeTupleForm attr;
+	Form_pg_attribute attr;
 	Datum		best,
 				guess1,
 				guess2,
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index b9e63d1e25b..fea963fc110 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.23 1998/07/27 19:38:32 vadim Exp $
+ * $Id: executor.h,v 1.24 1998/09/01 03:28:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -181,7 +181,7 @@ ExecAssignScanType(CommonScanState *csstate,
 extern void
 ExecAssignScanTypeFromOuterPlan(Plan *node,
 								CommonScanState *csstate);
-extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc);
+extern Form_pg_attribute ExecGetTypeInfo(Relation relDesc);
 
 extern void
 ExecOpenIndices(Oid resultRelationOid,
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index 322c3e0e51f..f8291ccb1c4 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -4,7 +4,7 @@
  *	  Interface to hba.c
  *
  *
- * $Id: hba.h,v 1.9 1998/06/13 04:27:18 momjian Exp $
+ * $Id: hba.h,v 1.10 1998/09/01 03:28:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,6 +55,6 @@ hba_getauthmethod(SockAddr *raddr, char *user, char *database,
 				  char *auth_arg, UserAuth *auth_method);
 int
 authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr,
-		  const char postgres_username[], const char auth_arg[]);
+		  const char *postgres_username, const char *auth_arg);
 
 #endif
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 9d1f12852ba..b7fc3ede877 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.28 1998/08/25 21:37:02 scrappy Exp $
+ * $Id: nodes.h,v 1.29 1998/09/01 03:28:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -79,11 +79,11 @@ typedef enum NodeTag
 	T_OrderKey,
 	T_JoinKey,
 	T_MergeOrder,
-	T_CInfo,
+	T_ClauseInfo,
 	T_JoinMethod,
 	T_HInfo,
 	T_MInfo,
-	T_JInfo,
+	T_JoinInfo,
 	T_Iter,
 	T_Stream,
 
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 11871611445..69fb9119211 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relation.h,v 1.9 1998/08/04 16:44:26 momjian Exp $
+ * $Id: relation.h,v 1.10 1998/09/01 03:28:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -207,7 +207,7 @@ typedef struct JoinKey
  * clause info
  *******/
 
-typedef struct CInfo
+typedef struct ClauseInfo
 {
 	NodeTag		type;
 	Expr	   *clause;			/* should be an OP clause */
@@ -221,7 +221,7 @@ typedef struct CInfo
 	/* hashjoin only */
 	Oid			hashjoinoperator;
 	Relid		cinfojoinid;
-} CInfo;
+} ClauseInfo;
 
 typedef struct JoinMethod
 {
@@ -242,7 +242,7 @@ typedef struct MInfo
 	MergeOrder *m_ordering;
 } MInfo;
 
-typedef struct JInfo
+typedef struct JoinInfo
 {
 	NodeTag		type;
 	List	   *otherrels;
@@ -250,7 +250,7 @@ typedef struct JInfo
 	bool		mergejoinable;
 	bool		hashjoinable;
 	bool		inactive;
-} JInfo;
+} JoinInfo;
 
 typedef struct Iter
 {
@@ -285,7 +285,7 @@ typedef struct Stream
 {
 	NodeTag		type;
 	Path	   *pathptr;
-	CInfo	   *cinfo;
+	ClauseInfo	   *cinfo;
 	int		   *clausetype;
 	struct Stream *upstream;
 	struct Stream *downstream;
diff --git a/src/include/optimizer/clauseinfo.h b/src/include/optimizer/clauseinfo.h
index db8fffe4d29..0fa10b2e490 100644
--- a/src/include/optimizer/clauseinfo.h
+++ b/src/include/optimizer/clauseinfo.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: clauseinfo.h,v 1.7 1998/02/26 04:42:08 momjian Exp $
+ * $Id: clauseinfo.h,v 1.8 1998/09/01 03:28:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #include "nodes/pg_list.h"
 #include "nodes/relation.h"
 
-extern bool valid_or_clause(CInfo *clauseinfo);
+extern bool valid_or_clause(ClauseInfo *clauseinfo);
 extern List *get_actual_clauses(List *clauseinfo_list);
 extern void
 get_relattvals(List *clauseinfo_list, List **attnos,
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 57fe535df0c..cbb2893257e 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: joininfo.h,v 1.6 1998/07/18 04:22:51 momjian Exp $
+ * $Id: joininfo.h,v 1.7 1998/09/01 03:28:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,8 +17,8 @@
 #include "nodes/relation.h"
 #include "nodes/primnodes.h"
 
-extern JInfo *joininfo_member(List *join_relids, List *joininfo_list);
-extern JInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids);
+extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list);
+extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids);
 extern Var *other_join_clause_var(Var *var, Expr *clause);
 
 #endif							/* JOININFO_H */
diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h
index cbc998c7a96..77146a326d4 100644
--- a/src/include/optimizer/xfunc.h
+++ b/src/include/optimizer/xfunc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xfunc.h,v 1.8 1998/07/18 04:22:52 momjian Exp $
+ * $Id: xfunc.h,v 1.9 1998/09/01 03:28:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,9 +52,9 @@ extern int	XfuncMode;			/* defined in tcop/postgres.c */
 extern void xfunc_trypullup(RelOptInfo *rel);
 extern int
 xfunc_shouldpull(Path *childpath, JoinPath *parentpath,
-				 int whichchild, CInfo *maxcinfopt);
-extern CInfo *
-xfunc_pullup(Path *childpath, JoinPath *parentpath, CInfo *cinfo,
+				 int whichchild, ClauseInfo *maxcinfopt);
+extern ClauseInfo *
+xfunc_pullup(Path *childpath, JoinPath *parentpath, ClauseInfo *cinfo,
 			 int whichchild, int clausetype);
 extern Cost xfunc_rank(Expr *clause);
 extern Cost xfunc_expense(Query *queryInfo, Expr *clause);
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index ef1dbbc77f7..5974f765ca9 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dest.h,v 1.14 1998/05/06 23:50:49 momjian Exp $
+ * $Id: dest.h,v 1.15 1998/09/01 03:28:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,7 +57,7 @@ typedef enum
 
 typedef struct AttrInfo {
 	int					numAttr;
-	AttributeTupleForm	*attrs;
+	Form_pg_attribute	*attrs;
 } AttrInfo;
 */
 
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index c5b8804151d..fb7beef36a7 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.12 1998/07/12 21:29:38 momjian Exp $
+ * $Id: array.h,v 1.13 1998/09/01 03:28:26 momjian Exp $
  *
  * NOTES
  *	  XXX the data array should be LONGALIGN'd -- notice that the array
@@ -118,17 +118,17 @@ extern char *array_in(char *string, Oid element_type, int32 typmod);
 extern char *array_out(ArrayType *v, Oid element_type);
 extern char *array_dims(ArrayType *v, bool *isNull);
 extern Datum
-array_ref(ArrayType *array, int n, int indx[], int reftype,
+array_ref(ArrayType *array, int n, int *indx, int reftype,
 		  int elmlen, int arraylen, bool *isNull);
 extern Datum
-array_clip(ArrayType *array, int n, int upperIndx[],
-		   int lowerIndx[], int reftype, int len, bool *isNull);
+array_clip(ArrayType *array, int n, int *upperIndx,
+		   int *lowerIndx, int reftype, int len, bool *isNull);
 extern char *
-array_set(ArrayType *array, int n, int indx[], char *dataPtr,
+array_set(ArrayType *array, int n, int *indx, char *dataPtr,
 		  int reftype, int elmlen, int arraylen, bool *isNull);
 extern char *
-array_assgn(ArrayType *array, int n, int upperIndx[],
-			int lowerIndx[], ArrayType *newArr, int reftype,
+array_assgn(ArrayType *array, int n, int *upperIndx,
+			int *lowerIndx, ArrayType *newArr, int reftype,
 			int len, bool *isNull);
 extern int	array_eq(ArrayType *array1, ArrayType *array2);
 extern int
@@ -143,27 +143,27 @@ extern char *_array_newLO(int *fd, int flag);
  * [these names seem to be too generic. Add prefix for arrays? -- AY]
  */
 
-extern int	GetOffset(int n, int dim[], int lb[], int indx[]);
-extern int	getNitems(int n, int a[]);
-extern int	compute_size(int st[], int endp[], int n, int base);
-extern void mda_get_offset_values(int n, int dist[], int PC[], int span[]);
-extern void mda_get_range(int n, int span[], int st[], int endp[]);
-extern void mda_get_prod(int n, int range[], int P[]);
-extern int	tuple2linear(int n, int tup[], int scale[]);
-extern void array2chunk_coord(int n, int C[], int a_coord[], int c_coord[]);
-extern int	next_tuple(int n, int curr[], int span[]);
+extern int	GetOffset(int n, int *dim, int *lb, int *indx);
+extern int	getNitems(int n, int *a);
+extern int	compute_size(int *st, int *endp, int n, int base);
+extern void mda_get_offset_values(int n, int *dist, int *PC, int *span);
+extern void mda_get_range(int n, int *span, int *st, int *endp);
+extern void mda_get_prod(int n, int *range, int *P);
+extern int	tuple2linear(int n, int *tup, int *scale);
+extern void array2chunk_coord(int n, int *C, int *a_coord, int *c_coord);
+extern int	next_tuple(int n, int *curr, int *span);
 
 /*
  * prototypes for functions defined in chunk.c
  */
 extern char *
-_ChunkArray(int fd, FILE *afd, int ndim, int dim[], int baseSize,
+_ChunkArray(int fd, FILE *afd, int ndim, int *dim, int baseSize,
 			int *nbytes, char *chunkfile);
 extern int
-_ReadChunkArray(int st[], int endp[], int bsize, int fp,
+_ReadChunkArray(int *st, int *endp, int bsize, int fp,
 			 char *destfp, ArrayType *array, int isDestLO, bool *isNull);
 extern struct varlena *
-_ReadChunkArray1El(int st[], int bsize, int fp,
+_ReadChunkArray1El(int *st, int bsize, int fp,
 				   ArrayType *array, bool *isNull);
 
 
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 53cda4a9a0f..931e17f2bd7 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.49 1998/08/31 07:55:50 momjian Exp $
+ * $Id: builtins.h,v 1.50 1998/09/01 03:28:28 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -64,9 +64,9 @@ extern bool cideq(int8 arg1, int8 arg2);
 extern int32 int2in(char *num);
 extern char *int2out(int16 sh);
 extern int16 *int28in(char *shs);
-extern char *int28out(int16 (*shs)[]);
+extern char *int28out(int16 **shs);
 extern int32 *int44in(char *input_string);
-extern char *int44out(int32 an_array[]);
+extern char *int44out(int32 *an_array);
 extern int32 int4in(char *num);
 extern char *int4out(int32 l);
 extern int32 i2toi4(int16 arg1);
@@ -165,7 +165,7 @@ extern int32 btint42cmp(int32 a, int16 b);
 extern int32 btfloat4cmp(float32 a, float32 b);
 extern int32 btfloat8cmp(float64 a, float64 b);
 extern int32 btoidcmp(Oid a, Oid b);
-extern int32 btoid8cmp(Oid a[], Oid b[]);
+extern int32 btoid8cmp(Oid *a, Oid *b);
 extern int32 btabstimecmp(AbsoluteTime a, AbsoluteTime b);
 extern int32 btcharcmp(char a, char b);
 extern int32 btnamecmp(NameData *a, NameData *b);
@@ -329,16 +329,16 @@ extern bool oidnotin(Oid the_oid, char *compare);
 
 /* oid.c */
 extern Oid *oid8in(char *oidString);
-extern char *oid8out(Oid (*oidArray)[]);
+extern char *oid8out(Oid **oidArray);
 extern Oid	oidin(char *s);
 extern char *oidout(Oid o);
 extern bool oideq(Oid arg1, Oid arg2);
 extern bool oidne(Oid arg1, Oid arg2);
-extern bool oid8eq(Oid arg1[], Oid arg2[]);
-extern bool oid8lt(Oid arg1[], Oid arg2[]);
-extern bool oid8le(Oid arg1[], Oid arg2[]);
-extern bool oid8ge(Oid arg1[], Oid arg2[]);
-extern bool oid8gt(Oid arg1[], Oid arg2[]);
+extern bool oid8eq(Oid *arg1, Oid *arg2);
+extern bool oid8lt(Oid *arg1, Oid *arg2);
+extern bool oid8le(Oid *arg1, Oid *arg2);
+extern bool oid8ge(Oid *arg1, Oid *arg2);
+extern bool oid8gt(Oid *arg1, Oid *arg2);
 extern bool oideqint4(Oid arg1, int32 arg2);
 extern bool int4eqoid(int32 arg1, Oid arg2);
 extern text *oid_text(Oid arg1);
@@ -358,7 +358,7 @@ extern bool texticregexne(struct varlena * s, struct varlena * p);
 /* regproc.c */
 extern int32 regprocin(char *pro_name_and_oid);
 extern char *regprocout(RegProcedure proid);
-extern text *oid8types(Oid (*oidArray)[]);
+extern text *oid8types(Oid **oidArray);
 extern Oid	regproctooid(RegProcedure rp);
 
 /* define macro to replace mixed-case function call - tgl 97/04/27 */
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index c759416ab09..e955c29f3df 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.11 1998/02/26 04:43:53 momjian Exp $
+ * $Id: catcache.h,v 1.12 1998/09/01 03:28:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -70,7 +70,7 @@ extern void ResetSystemCache(void);
 extern void SystemCacheRelationFlushed(Oid relId);
 extern CatCache *
 InitSysCache(char *relname, char *indname, int id, int nkeys,
-			 int key[], HeapTuple (*iScanfuncP) ());
+			 int *key, HeapTuple (*iScanfuncP) ());
 extern HeapTuple
 SearchSysCache(struct catcache * cache, Datum v1, Datum v2,
 			   Datum v3, Datum v4);
diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index b3ccab76968..0e947d63932 100644
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dt.h,v 1.30 1998/05/31 17:08:35 thomas Exp $
+ * $Id: dt.h,v 1.31 1998/09/01 03:28:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -325,17 +325,17 @@ extern double time2t(const int hour, const int min, const double sec);
 
 extern int
 ParseDateTime(char *timestr, char *lowstr,
-			  char *field[], int ftype[], int maxfields, int *numfields);
+			  char **field, int *ftype, int maxfields, int *numfields);
 extern int
-DecodeDateTime(char *field[], int ftype[],
+DecodeDateTime(char **field, int *ftype,
 			 int nf, int *dtype, struct tm * tm, double *fsec, int *tzp);
 
 extern int
-DecodeTimeOnly(char *field[], int ftype[], int nf,
+DecodeTimeOnly(char **field, int *ftype, int nf,
 			   int *dtype, struct tm * tm, double *fsec);
 
 extern int
-DecodeDateDelta(char *field[], int ftype[],
+DecodeDateDelta(char **field, int *ftype,
 				int nf, int *dtype, struct tm * tm, double *fsec);
 
 extern int	EncodeDateOnly(struct tm * tm, int style, char *str);
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index edfd5d47b8e..206c011ba2c 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.18 1998/08/19 02:04:07 momjian Exp $
+ * $Id: rel.h,v 1.19 1998/09/01 03:28:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -127,22 +127,13 @@ typedef Relation *RelationPtr;
 #define RelationDecrementReferenceCount(relation) ((relation)->rd_refcnt -= 1)
 
 /*
- * RelationGetAccessMethodTupleForm --
- *		Returns access method attribute values for a relation.
- *
- * Note:
- *		Assumes relation descriptor is valid.
- */
-#define RelationGetAccessMethodTupleForm(relation) ((relation)->rd_am)
-
-/*
- * RelationGetRelationTupleForm --
+ * RelationGetForm --
  *		Returns relation attribute values for a relation.
  *
  * Note:
  *		Assumes relation descriptor is valid.
  */
-#define RelationGetRelationTupleForm(relation) ((relation)->rd_rel)
+#define RelationGetForm(relation) ((relation)->rd_rel)
 
 
 /*
@@ -176,13 +167,13 @@ typedef Relation *RelationPtr;
 #define RelationGetNumberOfAttributes(relation) ((relation)->rd_rel->relnatts)
 
 /*
- * RelationGetTupleDescriptor --
+ * RelationGetDescr --
  *		Returns tuple descriptor for a relation.
  *
  * Note:
  *		Assumes relation descriptor is valid.
  */
-#define RelationGetTupleDescriptor(relation) ((relation)->rd_att)
+#define RelationGetDescr(relation) ((relation)->rd_att)
 
 extern IndexStrategy RelationGetIndexStrategy(Relation relation);