Renaming cleanup, no pgindent yet.

src/backend/access/common/heaptuple.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.39 1998/08/19 02:00:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.40 1998/09/01 03:20:41 momjian Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -55,13 +55,13 @@ long		heap_sysoffset[] = {
  */
 Size
 ComputeDataSize(TupleDesc tupleDesc,
-				Datum value[],
-				char nulls[])
+				Datum *value,
+				char *nulls)
 {
 	uint32		data_length;
 	int			i;
 	int			numberOfAttributes = tupleDesc->natts;
-	AttributeTupleForm *att = tupleDesc->attrs;
+	Form_pg_attribute *att = tupleDesc->attrs;
 
 	for (data_length = 0, i = 0; i < numberOfAttributes; i++)
 	{
@@ -118,8 +118,8 @@ ComputeDataSize(TupleDesc tupleDesc,
 void
 DataFill(char *data,
 		 TupleDesc tupleDesc,
-		 Datum value[],
-		 char nulls[],
+		 Datum *value,
+		 char *nulls,
 		 uint16 *infomask,
 		 bits8 *bit)
 {
@@ -128,7 +128,7 @@ DataFill(char *data,
 	uint32		data_length;
 	int			i;
 	int			numberOfAttributes = tupleDesc->natts;
-	AttributeTupleForm *att = tupleDesc->attrs;
+	Form_pg_attribute *att = tupleDesc->attrs;
 
 	if (bit != NULL)
 	{
@@ -227,13 +227,13 @@ int
 heap_attisnull(HeapTuple tup, int attnum)
 {
 	if (attnum > (int) tup->t_natts)
-		return (1);
+		return 1;
 
 	if (HeapTupleNoNulls(tup))
-		return (0);
+		return 0;
 
 	if (attnum > 0)
-		return (att_isnull(attnum - 1, tup->t_bits));
+		return att_isnull(attnum - 1, tup->t_bits);
 	else
 		switch (attnum)
 		{
@@ -252,7 +252,7 @@ heap_attisnull(HeapTuple tup, int attnum)
 				elog(ERROR, "heap_attisnull: undefined negative attnum");
 		}
 
-	return (0);
+	return 0;
 }
 
 /* ----------------------------------------------------------------
@@ -343,21 +343,21 @@ heap_getsysattr(HeapTuple tup, Buffer b, int attnum)
 	switch (attnum)
 	{
 			case SelfItemPointerAttributeNumber:
-			return ((Datum) &tup->t_ctid);
+			return (Datum) &tup->t_ctid;
 		case ObjectIdAttributeNumber:
-			return ((Datum) (long) tup->t_oid);
+			return (Datum) (long) tup->t_oid;
 		case MinTransactionIdAttributeNumber:
-			return ((Datum) (long) tup->t_xmin);
+			return (Datum) (long) tup->t_xmin;
 		case MinCommandIdAttributeNumber:
-			return ((Datum) (long) tup->t_cmin);
+			return (Datum) (long) tup->t_cmin;
 		case MaxTransactionIdAttributeNumber:
-			return ((Datum) (long) tup->t_xmax);
+			return (Datum) (long) tup->t_xmax;
 		case MaxCommandIdAttributeNumber:
-			return ((Datum) (long) tup->t_cmax);
+			return (Datum) (long) tup->t_cmax;
 		default:
 			elog(ERROR, "heap_getsysattr: undefined attnum %d", attnum);
 	}
-	return ((Datum) NULL);
+	return (Datum) NULL;
 }
 
 /* ----------------
@@ -388,7 +388,7 @@ nocachegetattr(HeapTuple tup,
 	char	   *tp;				/* ptr to att in tuple */
 	bits8	   *bp = tup->t_bits;		/* ptr to att in tuple */
 	int			slow;			/* do we have to walk nulls? */
-	AttributeTupleForm *att = tupleDesc->attrs;
+	Form_pg_attribute *att = tupleDesc->attrs;
 
 
 #if IN_MACRO
@@ -426,7 +426,7 @@ nocachegetattr(HeapTuple tup,
 			/*
 			 * first attribute is always at position zero
 			 */
-			return ((Datum) fetchatt(&(att[0]), (char *) tup + tup->t_hoff));
+			return (Datum) fetchatt(&(att[0]), (char *) tup + tup->t_hoff);
 		}
 #endif
 
@@ -505,7 +505,7 @@ nocachegetattr(HeapTuple tup,
 									tp + att[attnum]->attcacheoff);
 		}
 		else if (attnum == 0)
-			return ((Datum) fetchatt(&(att[0]), (char *) tp));
+			return (Datum) fetchatt(&(att[0]), (char *) tp);
 		else if (!HeapTupleAllFixed(tup))
 		{
 			int			j = 0;
@@ -734,11 +734,11 @@ heap_copytuple(HeapTuple tuple)
 	HeapTuple	newTuple;
 
 	if (!HeapTupleIsValid(tuple))
-		return (NULL);
+		return NULL;
 
 	newTuple = (HeapTuple) palloc(tuple->t_len);
 	memmove((char *) newTuple, (char *) tuple, (int) tuple->t_len);
-	return (newTuple);
+	return newTuple;
 }
 
 #ifdef NOT_USED
@@ -751,8 +751,8 @@ heap_copytuple(HeapTuple tuple)
 void
 heap_deformtuple(HeapTuple tuple,
 				 TupleDesc tdesc,
-				 Datum values[],
-				 char nulls[])
+				 Datum *values,
+				 char *nulls)
 {
 	int			i;
 	int			natts;
@@ -780,7 +780,7 @@ heap_deformtuple(HeapTuple tuple,
 /* ----------------
  *		heap_formtuple
  *
- *		constructs a tuple from the given value[] and null[] arrays
+ *		constructs a tuple from the given *value and *null arrays
  *
  * old comments
  *		Handles alignment by aligning 2 byte attributes on short boundries
@@ -789,7 +789,7 @@ heap_deformtuple(HeapTuple tuple,
  *		not properly align fixed length arrays of 1 or 2 byte types (yet).
  *
  *		Null attributes are indicated by a 'n' in the appropriate byte
- *		of the null[].	Non-null attributes are indicated by a ' ' (space).
+ *		of the *null.	Non-null attributes are indicated by a ' ' (space).
  *
  *		Fix me.  (Figure that must keep context if debug--allow give oid.)
  *		Assumes in order.
@@ -797,8 +797,8 @@ heap_deformtuple(HeapTuple tuple,
  */
 HeapTuple
 heap_formtuple(TupleDesc tupleDescriptor,
-			   Datum value[],
-			   char nulls[])
+			   Datum *value,
+			   char *nulls)
 {
 	char	   *tp;				/* tuple pointer */
 	HeapTuple	tuple;			/* return tuple */
@@ -849,7 +849,7 @@ heap_formtuple(TupleDesc tupleDescriptor,
 
 	tuple->t_infomask |= HEAP_XMAX_INVALID;
 
-	return (tuple);
+	return tuple;
 }
 
 /* ----------------
@@ -862,9 +862,9 @@ heap_formtuple(TupleDesc tupleDescriptor,
 HeapTuple
 heap_modifytuple(HeapTuple tuple,
 				 Relation relation,
-				 Datum replValue[],
-				 char replNull[],
-				 char repl[])
+				 Datum *replValue,
+				 char *replNull,
+				 char *repl)
 {
 	int			attoff;
 	int			numberOfAttributes;
@@ -884,10 +884,10 @@ heap_modifytuple(HeapTuple tuple,
 	Assert(PointerIsValid(replNull));
 	Assert(PointerIsValid(repl));
 
-	numberOfAttributes = RelationGetRelationTupleForm(relation)->relnatts;
+	numberOfAttributes = RelationGetForm(relation)->relnatts;
 
 	/* ----------------
-	 *	allocate and fill value[] and nulls[] arrays from either
+	 *	allocate and fill *value and *nulls arrays from either
 	 *	the tuple or the repl information, as appropriate.
 	 * ----------------
 	 */
@@ -904,7 +904,7 @@ heap_modifytuple(HeapTuple tuple,
 			value[attoff] =
 				heap_getattr(tuple,
 							 AttrOffsetGetAttrNumber(attoff),
-							 RelationGetTupleDescriptor(relation),
+							 RelationGetDescr(relation),
 							 &isNull);
 			nulls[attoff] = (isNull) ? 'n' : ' ';
 
@@ -919,10 +919,10 @@ heap_modifytuple(HeapTuple tuple,
 	}
 
 	/* ----------------
-	 *	create a new tuple from the values[] and nulls[] arrays
+	 *	create a new tuple from the *values and *nulls arrays
 	 * ----------------
 	 */
-	newTuple = heap_formtuple(RelationGetTupleDescriptor(relation),
+	newTuple = heap_formtuple(RelationGetDescr(relation),
 							  value,
 							  nulls);
 
@@ -972,5 +972,5 @@ heap_addheader(uint32 natts,	/* max domain index */
 
 	memmove(tp, structure, structlen);
 
-	return (tup);
+	return tup;
 }

src/backend/access/common/indextuple.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.30 1998/08/27 05:06:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.31 1998/09/01 03:20:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,8 +38,8 @@
  */
 IndexTuple
 index_formtuple(TupleDesc tupleDescriptor,
-				Datum value[],
-				char null[])
+				Datum *value,
+				char *null)
 {
 	char	   *tp;				/* tuple pointer */
 	IndexTuple	tuple;			/* return tuple */
@@ -107,7 +107,7 @@ index_formtuple(TupleDesc tupleDescriptor,
 	 * ----------------
 	 */
 	tuple->t_info = infomask;
-	return (tuple);
+	return tuple;
 }
 
 /* ----------------
@@ -139,7 +139,7 @@ nocache_index_getattr(IndexTuple tup,
 	char	   *bp = NULL;		/* ptr to att in tuple */
 	int			slow;			/* do we have to walk nulls? */
 	int			data_off;		/* tuple data offset */
-	AttributeTupleForm *att = tupleDesc->attrs;
+	Form_pg_attribute *att = tupleDesc->attrs;
 
 	/* ----------------
 	 *	sanity checks
@@ -256,7 +256,7 @@ nocache_index_getattr(IndexTuple tup,
 									tp + att[attnum]->attcacheoff);
 		}
 		else if (attnum == 0)
-			return ((Datum) fetchatt(&(att[0]), (char *) tp));
+			return (Datum) fetchatt(&(att[0]), (char *) tp);
 		else if (!IndexTupleAllFixed(tup))
 		{
 			int			j = 0;
@@ -461,7 +461,7 @@ FormRetrieveIndexResult(ItemPointer indexItemPointer,
 	result->index_iptr = *indexItemPointer;
 	result->heap_iptr = *heapItemPointer;
 
-	return (result);
+	return result;
 }
 
 /*

src/backend/access/common/indexvalid.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.19 1998/06/15 19:27:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.20 1998/09/01 03:20:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,11 +57,11 @@ index_keytest(IndexTuple tuple,
 		if (isNull)
 		{
 			/* XXX eventually should check if SK_ISNULL */
-			return (false);
+			return false;
 		}
 
 		if (key[0].sk_flags & SK_ISNULL)
-			return (false);
+			return false;
 
 		if (key[0].sk_flags & SK_COMMUTE)
 		{
@@ -77,11 +77,11 @@ index_keytest(IndexTuple tuple,
 		}
 
 		if (!test == !(key[0].sk_flags & SK_NEGATE))
-			return (false);
+			return false;
 
 		scanKeySize -= 1;
 		key++;
 	}
 
-	return (true);
+	return true;
 }

src/backend/access/common/printtup.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.33 1998/08/30 19:30:38 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.34 1998/09/01 03:20:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,10 +46,10 @@ typtoout(Oid type)
 									0, 0, 0);
 
 	if (HeapTupleIsValid(typeTuple))
-		return ((Oid) ((TypeTupleForm) GETSTRUCT(typeTuple))->typoutput);
+		return (Oid) ((Form_pg_type) GETSTRUCT(typeTuple))->typoutput;
 
 	elog(ERROR, "typtoout: Cache lookup of type %d failed", type);
-	return (InvalidOid);
+	return InvalidOid;
 }
 
 Oid
@@ -62,10 +62,10 @@ gettypelem(Oid type)
 									0, 0, 0);
 
 	if (HeapTupleIsValid(typeTuple))
-		return ((Oid) ((TypeTupleForm) GETSTRUCT(typeTuple))->typelem);
+		return (Oid) ((Form_pg_type) GETSTRUCT(typeTuple))->typelem;
 
 	elog(ERROR, "typtoout: Cache lookup of type %d failed", type);
-	return (InvalidOid);
+	return InvalidOid;
 }
 
 /* ----------------
@@ -157,7 +157,7 @@ printtup(HeapTuple tuple, TupleDesc typeinfo)
  */
 static void
 printatt(unsigned attributeId,
-		 AttributeTupleForm attributeP,
+		 Form_pg_attribute attributeP,
 		 char *value)
 {
 	printf("\t%2d: %s%s%s%s\t(typeid = %u, len = %d, typmod = %d, byval = %c)\n",
@@ -181,7 +181,7 @@ showatts(char *name, TupleDesc tupleDesc)
 {
 	int			i;
 	int			natts = tupleDesc->natts;
-	AttributeTupleForm *attinfo = tupleDesc->attrs;
+	Form_pg_attribute *attinfo = tupleDesc->attrs;
 
 	puts(name);
 	for (i = 0; i < natts; ++i)

src/backend/access/common/tupdesc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.42 1998/08/19 02:00:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.43 1998/09/01 03:20:46 momjian Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -57,25 +57,25 @@ CreateTemplateTupleDesc(int natts)
 	 *	is filled with NULL pointers.
 	 * ----------------
 	 */
-	size = natts * sizeof(AttributeTupleForm);
+	size = natts * sizeof(Form_pg_attribute);
 	desc = (TupleDesc) palloc(sizeof(struct tupleDesc));
-	desc->attrs = (AttributeTupleForm *) palloc(size);
+	desc->attrs = (Form_pg_attribute *) palloc(size);
 	desc->constr = NULL;
 	MemSet(desc->attrs, 0, size);
 
 	desc->natts = natts;
 
-	return (desc);
+	return desc;
 }
 
 /* ----------------------------------------------------------------
  *		CreateTupleDesc
  *
- *		This function allocates a new TupleDesc from AttributeTupleForm array
+ *		This function allocates a new TupleDesc from Form_pg_attribute array
  * ----------------------------------------------------------------
  */
 TupleDesc
-CreateTupleDesc(int natts, AttributeTupleForm *attrs)
+CreateTupleDesc(int natts, Form_pg_attribute *attrs)
 {
 	TupleDesc	desc;
 
@@ -90,7 +90,7 @@ CreateTupleDesc(int natts, AttributeTupleForm *attrs)
 	desc->natts = natts;
 	desc->constr = NULL;
 
-	return (desc);
+	return desc;
 }
 
 /* ----------------------------------------------------------------
@@ -111,12 +111,12 @@ CreateTupleDescCopy(TupleDesc tupdesc)
 
 	desc = (TupleDesc) palloc(sizeof(struct tupleDesc));
 	desc->natts = tupdesc->natts;
-	size = desc->natts * sizeof(AttributeTupleForm);
-	desc->attrs = (AttributeTupleForm *) palloc(size);
+	size = desc->natts * sizeof(Form_pg_attribute);
+	desc->attrs = (Form_pg_attribute *) palloc(size);
 	for (i = 0; i < desc->natts; i++)
 	{
 		desc->attrs[i] =
-			(AttributeTupleForm) palloc(ATTRIBUTE_TUPLE_SIZE);
+			(Form_pg_attribute) palloc(ATTRIBUTE_TUPLE_SIZE);
 		memmove(desc->attrs[i],
 				tupdesc->attrs[i],
 				ATTRIBUTE_TUPLE_SIZE);
@@ -146,12 +146,12 @@ CreateTupleDescCopyConstr(TupleDesc tupdesc)
 
 	desc = (TupleDesc) palloc(sizeof(struct tupleDesc));
 	desc->natts = tupdesc->natts;
-	size = desc->natts * sizeof(AttributeTupleForm);
-	desc->attrs = (AttributeTupleForm *) palloc(size);
+	size = desc->natts * sizeof(Form_pg_attribute);
+	desc->attrs = (Form_pg_attribute *) palloc(size);
 	for (i = 0; i < desc->natts; i++)
 	{
 		desc->attrs[i] =
-			(AttributeTupleForm) palloc(ATTRIBUTE_TUPLE_SIZE);
+			(Form_pg_attribute) palloc(ATTRIBUTE_TUPLE_SIZE);
 		memmove(desc->attrs[i],
 				tupdesc->attrs[i],
 				ATTRIBUTE_TUPLE_SIZE);
@@ -260,8 +260,8 @@ TupleDescInitEntry(TupleDesc desc,
 				   bool attisset)
 {
 	HeapTuple	tuple;
-	TypeTupleForm typeForm;
-	AttributeTupleForm att;
+	Form_pg_type typeForm;
+	Form_pg_attribute att;
 
 	/* ----------------
 	 *	sanity checks
@@ -284,7 +284,7 @@ TupleDescInitEntry(TupleDesc desc,
 	 * ----------------
 	 */
 
-	att = (AttributeTupleForm) palloc(ATTRIBUTE_TUPLE_SIZE);
+	att = (Form_pg_attribute) palloc(ATTRIBUTE_TUPLE_SIZE);
 	desc->attrs[attributeNumber - 1] = att;
 
 	/* ----------------
@@ -349,7 +349,7 @@ TupleDescInitEntry(TupleDesc desc,
 	 *	information from the type tuple we found..
 	 * ----------------
 	 */
-	typeForm = (TypeTupleForm) GETSTRUCT(tuple);
+	typeForm = (Form_pg_type) GETSTRUCT(tuple);
 
 	att->atttypid = tuple->t_oid;
 	att->attalign = typeForm->typalign;
@@ -412,7 +412,7 @@ TupleDescMakeSelfReference(TupleDesc desc,
 						   AttrNumber attnum,
 						   char *relname)
 {
-	AttributeTupleForm att;
+	Form_pg_attribute att;
 	Type		t = typeidType(OIDOID);
 
 	att = desc->attrs[attnum - 1];

src/backend/access/gist/gist.c

@@ -141,8 +141,8 @@ gistbuild(Relation heap,
 	}
 
 	/* init the tuple descriptors and get set for a heap scan */
-	hd = RelationGetTupleDescriptor(heap);
-	id = RelationGetTupleDescriptor(index);
+	hd = RelationGetDescr(heap);
+	id = RelationGetDescr(index);
 	d = (Datum *) palloc(natts * sizeof(*d));
 	nulls = (bool *) palloc(natts * sizeof(*nulls));
 
@@ -350,7 +350,7 @@ gistinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation
 			compvec[i] = FALSE;
 		datum[i] = (Datum) tmpentry.pred;
 	}
-	itup = index_formtuple(RelationGetTupleDescriptor(r), datum, nulls);
+	itup = index_formtuple(RelationGetDescr(r), datum, nulls);
 	itup->t_tid = *ht_ctid;
 
 	RelationSetLockForWrite(r);
@@ -362,7 +362,7 @@ gistinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation
 	pfree(compvec);
 
 	/* XXX two-phase locking -- don't unlock the relation until EOT */
-	return (res);
+	return res;
 }
 
 /*
@@ -431,7 +431,7 @@ gistdoinsert(Relation r,
 		res = gistSplit(r, buffer, stack, itup, giststate);
 		gistfreestack(stack);
 		WriteBuffer(buffer);	/* don't forget to release buffer! */
-		return (res);
+		return res;
 	}
 
 	if (PageIsEmpty(page))
@@ -458,7 +458,7 @@ gistdoinsert(Relation r,
 	res = (InsertIndexResult) palloc(sizeof(InsertIndexResultData));
 	ItemPointerSet(&(res->pointerData), blk, l);
 
-	return (res);
+	return res;
 }
 
 
@@ -512,7 +512,7 @@ gistChooseSubtree(Relation r, IndexTuple itup,	/* itup has compressed
 	*retstack = stack;
 	*leafbuf = buffer;
 
-	return (blk);
+	return blk;
 }
 
 
@@ -568,7 +568,7 @@ gistAdjustKeys(Relation r,
 	(*fmgr_faddr(&giststate->equalFn)) (ev0p->pred, datum, &result);
 	if (!result)
 	{
-		TupleDesc	td = RelationGetTupleDescriptor(r);
+		TupleDesc	td = RelationGetDescr(r);
 
 		/* compress datum for storage on page */
 		gistcentryinit(giststate, &centry, datum, ev0p->rel, ev0p->page,
@@ -869,7 +869,7 @@ gistSplit(Relation r,
 	pfree(ltup);
 	pfree(rtup);
 
-	return (res);
+	return res;
 }
 
 /*
@@ -962,7 +962,7 @@ gistentryinsert(Relation r, GISTSTACK *stk, IndexTuple tup,
 		res = gistSplit(r, b, stk->gs_parent, tup, giststate);
 		WriteBuffer(b);			/* don't forget to release buffer!  -
 								 * 01/31/94 */
-		return (res);
+		return res;
 	}
 	else
 	{
@@ -978,7 +978,7 @@ gistentryinsert(Relation r, GISTSTACK *stk, IndexTuple tup,
 			pfree(tmpentry.pred);
 		if (tup != newtup)
 			pfree(newtup);
-		return (res);
+		return res;
 	}
 }
 
@@ -1079,13 +1079,13 @@ gistchoose(Relation r, Page p, IndexTuple it,	/* it has compressed entry */
 	if (identry.pred != id)
 		pfree(identry.pred);
 
-	return (which);
+	return which;
 }
 
 static int
 gistnospace(Page p, IndexTuple it)
 {
-	return (PageGetFreeSpace(p) < IndexTupleSize(it));
+	return PageGetFreeSpace(p) < IndexTupleSize(it);
 }
 
 void
@@ -1144,7 +1144,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
 				picksplit_proc,
 				equal_proc;
 	HeapTuple	htup;
-	IndexTupleForm itupform;
+	Form_pg_index itupform;
 
 	consistent_proc = index_getprocid(index, 1, GIST_CONSISTENT_PROC);
 	union_proc = index_getprocid(index, 1, GIST_UNION_PROC);
@@ -1165,7 +1165,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
 	htup = SearchSysCacheTuple(INDEXRELID,
 							   ObjectIdGetDatum(RelationGetRelid(index)),
 							   0, 0, 0);
-	itupform = (IndexTupleForm) GETSTRUCT(htup);
+	itupform = (Form_pg_index) GETSTRUCT(htup);
 	if (!HeapTupleIsValid(htup))
 		elog(ERROR, "initGISTstate: index %d not found",
 		RelationGetRelid(index));
@@ -1183,7 +1183,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
 				 itupform->indexrelid, FirstOffsetNumber);
 			return;
 		}
-		giststate->keytypbyval = (((AttributeTupleForm) htup)->attbyval);
+		giststate->keytypbyval = (((Form_pg_attribute) htup)->attbyval);
 	}
 	else
 		giststate->keytypbyval = FALSE;
@@ -1210,7 +1210,7 @@ gist_tuple_replacekey(Relation r, GISTENTRY entry, IndexTuple t)
 		/* or in new size */
 		t->t_info |= MAXALIGN(entry.bytes + sizeof(IndexTupleData));
 
-		return (t);
+		return t;
 	}
 	else
 	{
@@ -1228,7 +1228,7 @@ gist_tuple_replacekey(Relation r, GISTENTRY entry, IndexTuple t)
 											  isnull);
 		newtup->t_tid = t->t_tid;
 		pfree(isnull);
-		return (newtup);
+		return newtup;
 	}
 }
 
@@ -1345,7 +1345,7 @@ text_range_out(TXTRANGE *r)
 			   *upper;
 
 	if (r == NULL)
-		return (NULL);
+		return NULL;
 	result = (char *) palloc(NAMEDATALEN + VARSIZE(TRLOWER(r)) + VARSIZE(TRUPPER(r))
 							 - 2 * VARHDRSZ);
 
@@ -1359,7 +1359,7 @@ text_range_out(TXTRANGE *r)
 	sprintf(result, "[%s,%s): %d", lower, upper, r->flag);
 	pfree(lower);
 	pfree(upper);
-	return (result);
+	return result;
 }
 
 #endif
@@ -1370,11 +1370,11 @@ int_range_out(INTRANGE *r)
 	char	   *result;
 
 	if (r == NULL)
-		return (NULL);
+		return NULL;
 	result = (char *) palloc(80);
 	sprintf(result, "[%d,%d): %d", r->lower, r->upper, r->flag);
 
-	return (result);
+	return result;
 }
 
 #endif							/* defined GISTDEBUG */

src/backend/access/gist/gistget.c

@@ -48,14 +48,14 @@ gistgettuple(IndexScanDesc s, ScanDirection dir)
 
 	/* if we have it cached in the scan desc, just return the value */
 	if ((res = gistscancache(s, dir)) != (RetrieveIndexResult) NULL)
-		return (res);
+		return res;
 
 	/* not cached, so we'll have to do some work */
 	if (ItemPointerIsValid(&(s->currentItemData)))
 		res = gistnext(s, dir);
 	else
 		res = gistfirst(s, dir);
-	return (res);
+	return res;
 }
 
 static RetrieveIndexResult
@@ -90,7 +90,7 @@ gistfirst(IndexScanDesc s, ScanDirection dir)
 
 			ReleaseBuffer(b);
 			if (so->s_stack == (GISTSTACK *) NULL)
-				return ((RetrieveIndexResult) NULL);
+				return (RetrieveIndexResult) NULL;
 
 			stk = so->s_stack;
 			b = ReadBuffer(s->relation, stk->gs_blk);
@@ -116,7 +116,7 @@ gistfirst(IndexScanDesc s, ScanDirection dir)
 			res = FormRetrieveIndexResult(&(s->currentItemData), &(it->t_tid));
 
 			ReleaseBuffer(b);
-			return (res);
+			return res;
 		}
 		else
 		{
@@ -174,7 +174,7 @@ gistnext(IndexScanDesc s, ScanDirection dir)
 
 			ReleaseBuffer(b);
 			if (so->s_stack == (GISTSTACK *) NULL)
-				return ((RetrieveIndexResult) NULL);
+				return (RetrieveIndexResult) NULL;
 
 			stk = so->s_stack;
 			b = ReadBuffer(s->relation, stk->gs_blk);
@@ -200,7 +200,7 @@ gistnext(IndexScanDesc s, ScanDirection dir)
 			res = FormRetrieveIndexResult(&(s->currentItemData), &(it->t_tid));
 
 			ReleaseBuffer(b);
-			return (res);
+			return res;
 		}
 		else
 		{
@@ -258,7 +258,7 @@ gistindex_keytest(IndexTuple tuple,
 		if (isNull)
 		{
 			/* XXX eventually should check if SK_ISNULL */
-			return (false);
+			return false;
 		}
 
 		if (key[0].sk_flags & SK_COMMUTE)
@@ -276,13 +276,13 @@ gistindex_keytest(IndexTuple tuple,
 		}
 
 		if (!test == !(key[0].sk_flags & SK_NEGATE))
-			return (false);
+			return false;
 
 		scanKeySize -= 1;
 		key++;
 	}
 
-	return (true);
+	return true;
 }
 
 
@@ -315,7 +315,7 @@ gistfindnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir)
 	{
 		it = (char *) PageGetItem(p, PageGetItemId(p, n));
 		if (gistindex_keytest((IndexTuple) it,
-							  RelationGetTupleDescriptor(s->relation),
+							  RelationGetDescr(s->relation),
 							  s->numberOfKeys, s->keyData, giststate,
 							  s->relation, p, n))
 			break;
@@ -326,7 +326,7 @@ gistfindnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir)
 			n = OffsetNumberNext(n);
 	}
 
-	return (n);
+	return n;
 }
 
 static RetrieveIndexResult
@@ -339,7 +339,7 @@ gistscancache(IndexScanDesc s, ScanDirection dir)
 		  && ItemPointerIsValid(&(s->currentItemData))))
 	{
 
-		return ((RetrieveIndexResult) NULL);
+		return (RetrieveIndexResult) NULL;
 	}
 
 	ip = gistheapptr(s->relation, &(s->currentItemData));
@@ -351,7 +351,7 @@ gistscancache(IndexScanDesc s, ScanDirection dir)
 
 	pfree(ip);
 
-	return (res);
+	return res;
 }
 
 /*
@@ -381,5 +381,5 @@ gistheapptr(Relation r, ItemPointer itemp)
 	else
 		ItemPointerSetInvalid(ip);
 
-	return (ip);
+	return ip;
 }

src/backend/access/gist/gistscan.c

@@ -72,7 +72,7 @@ gistbeginscan(Relation r,
 	s = RelationGetIndexScan(r, fromEnd, nkeys, key);
 	gistregscan(s);
 
-	return (s);
+	return s;
 }
 
 void

src/backend/access/gist/giststrat.c

@@ -99,7 +99,7 @@ RelationGetGISTStrategy(Relation r,
 						AttrNumber attnum,
 						RegProcedure proc)
 {
-	return (RelationGetStrategy(r, attnum, &GISTEvaluationData, proc));
+	return RelationGetStrategy(r, attnum, &GISTEvaluationData, proc);
 }
 
 #ifdef NOT_USED

src/backend/access/hash/hash.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.20 1998/08/19 02:01:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.21 1998/09/01 03:20:53 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -88,8 +88,8 @@ hashbuild(Relation heap,
 		_hash_metapinit(index);
 
 	/* get tuple descriptors for heap and index relations */
-	htupdesc = RelationGetTupleDescriptor(heap);
-	itupdesc = RelationGetTupleDescriptor(index);
+	htupdesc = RelationGetDescr(heap);
+	itupdesc = RelationGetDescr(index);
 
 	/* get space for data items that'll appear in the index tuple */
 	attdata = (Datum *) palloc(natts * sizeof(Datum));
@@ -284,11 +284,11 @@ hashinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relatio
 
 
 	/* generate an index tuple */
-	itup = index_formtuple(RelationGetTupleDescriptor(rel), datum, nulls);
+	itup = index_formtuple(RelationGetDescr(rel), datum, nulls);
 	itup->t_tid = *ht_ctid;
 
 	if (itup->t_info & INDEX_NULL_MASK)
-		return ((InsertIndexResult) NULL);
+		return (InsertIndexResult) NULL;
 
 	hitem = _hash_formitem(itup);
 
@@ -297,7 +297,7 @@ hashinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relatio
 	pfree(hitem);
 	pfree(itup);
 
-	return (res);
+	return res;
 }
 
 
@@ -320,7 +320,7 @@ hashgettuple(IndexScanDesc scan, ScanDirection dir)
 	else
 		res = _hash_first(scan, dir);
 
-	return ((char *) res);
+	return (char *) res;
 }
 
 
@@ -345,7 +345,7 @@ hashbeginscan(Relation rel,
 	/* register scan in case we change pages it's using */
 	_hash_regscan(scan);
 
-	return ((char *) scan);
+	return (char *) scan;
 }
 
 /*

src/backend/access/hash/hashfunc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.10 1998/08/19 02:01:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.11 1998/09/01 03:20:54 momjian Exp $
  *
  * NOTES
  *	  These functions are stored in pg_amproc.	For each operator class
@@ -23,13 +23,13 @@
 uint32
 hashint2(int16 key)
 {
-	return ((uint32) ~key);
+	return (uint32) ~key;
 }
 
 uint32
 hashint4(uint32 key)
 {
-	return (~key);
+	return ~key;
 }
 
 /* Hash function from Chris Torek. */
@@ -76,7 +76,7 @@ hashfloat4(float32 keyp)
 				} while (--loop);
 		}
 	}
-	return (h);
+	return h;
 }
 
 
@@ -123,18 +123,18 @@ hashfloat8(float64 keyp)
 				} while (--loop);
 		}
 	}
-	return (h);
+	return h;
 }
 
 
 uint32
 hashoid(Oid key)
 {
-	return ((uint32) ~key);
+	return (uint32) ~key;
 }
 
 uint32
-hashoid8(Oid key[])
+hashoid8(Oid *key)
 {
 	int i;
 	uint32 result = 0;
@@ -160,7 +160,7 @@ hashchar(char key)
 	h = h * PRIME1 ^ (key - ' ');
 	h %= PRIME2;
 
-	return (h);
+	return h;
 }
 
 
@@ -180,7 +180,7 @@ hashname(NameData *n)
 		h = h * PRIME1 ^ (*key++ - ' ');
 	h %= PRIME2;
 
-	return (h);
+	return h;
 }
 
 
@@ -240,5 +240,5 @@ hashtext(struct varlena * key)
 				} while (--loop);
 		}
 	}
-	return (n);
+	return n;
 }

src/backend/access/hash/hashinsert.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.13 1998/06/15 19:27:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.14 1998/09/01 03:20:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -85,7 +85,7 @@ _hash_doinsert(Relation rel, HashItem hitem)
 	/* be tidy */
 	_hash_freeskey(itup_scankey);
 
-	return (res);
+	return res;
 }
 
 /*
@@ -206,7 +206,7 @@ _hash_insertonpg(Relation rel,
 		> metap->hashm_ffactor)
 		_hash_expandtable(rel, metabuf);
 	_hash_relbuf(rel, metabuf, HASH_READ);
-	return (res);
+	return res;
 }
 
 /*
@@ -236,5 +236,5 @@ _hash_pgaddtup(Relation rel,
 	/* write the buffer, but hold our lock */
 	_hash_wrtnorelbuf(rel, buf);
 
-	return (itup_off);
+	return itup_off;
 }

src/backend/access/hash/hashovfl.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.16 1998/06/15 19:27:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.17 1998/09/01 03:20:57 momjian Exp $
  *
  * NOTES
  *	  Overflow pages look like ordinary relation pages.
@@ -84,7 +84,7 @@ _hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf)
 	/* logically chain overflow page to previous page */
 	pageopaque->hasho_nextblkno = ovflblkno;
 	_hash_wrtnorelbuf(rel, buf);
-	return (ovflbuf);
+	return ovflbuf;
 }
 
 /*
@@ -227,7 +227,7 @@ _hash_getovfladdr(Relation rel, Buffer *metabufp)
 	/* Calculate address of the new overflow page */
 	oaddr = OADDR_OF(splitnum, offset);
 	_hash_chgbufaccess(rel, metabufp, HASH_WRITE, HASH_READ);
-	return (oaddr);
+	return oaddr;
 
 found:
 	bit = bit + _hash_firstfreebit(freep[j]);
@@ -254,7 +254,7 @@ found:
 	/* initialize this page */
 	oaddr = OADDR_OF(i, offset);
 	_hash_chgbufaccess(rel, metabufp, HASH_WRITE, HASH_READ);
-	return (oaddr);
+	return oaddr;
 }
 
 /*
@@ -275,10 +275,10 @@ _hash_firstfreebit(uint32 map)
 	for (i = 0; i < BITS_PER_MAP; i++)
 	{
 		if (!(mask & map))
-			return (i);
+			return i;
 		mask = mask << 1;
 	}
-	return (i);
+	return i;
 }
 
 /*
@@ -387,9 +387,9 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)
 	 * return that buffer with a write lock.
 	 */
 	if (BlockNumberIsValid(nextblkno))
-		return (_hash_getbuf(rel, nextblkno, HASH_WRITE));
+		return _hash_getbuf(rel, nextblkno, HASH_WRITE);
 	else
-		return (InvalidBuffer);
+		return InvalidBuffer;
 }
 
 
@@ -455,7 +455,7 @@ _hash_initbitmap(Relation rel,
 	/* write out the new bitmap page (releasing its locks) */
 	_hash_wrtbuf(rel, buf);
 
-	return (0);
+	return 0;
 }
 
 

src/backend/access/hash/hashpage.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.16 1998/06/15 19:27:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.17 1998/09/01 03:20:58 momjian Exp $
  *
  * NOTES
  *	  Postgres hash pages look like ordinary relation pages.  The opaque
@@ -204,7 +204,7 @@ _hash_getbuf(Relation rel, BlockNumber blkno, int access)
 	buf = ReadBuffer(rel, blkno);
 
 	/* ref count and lock type are correct */
-	return (buf);
+	return buf;
 }
 
 /*
@@ -288,7 +288,7 @@ _hash_chgbufaccess(Relation rel,
 			break;
 	}
 	*bufp = _hash_getbuf(rel, blkno, to_access);
-	return (BufferGetPage(*bufp));
+	return BufferGetPage(*bufp);
 }
 
 /*
@@ -604,7 +604,7 @@ _hash_splitpage(Relation rel,
 		/* hash on the tuple */
 		hitem = (HashItem) PageGetItem(opage, PageGetItemId(opage, ooffnum));
 		itup = &(hitem->hash_itup);
-		itupdesc = RelationGetTupleDescriptor(rel);
+		itupdesc = RelationGetDescr(rel);
 		datum = index_getattr(itup, 1, itupdesc, &null);
 		bucket = _hash_call(rel, metap, datum);
 

src/backend/access/hash/hashscan.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.15 1998/08/19 02:01:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.16 1998/09/01 03:20:59 momjian Exp $
  *
  * NOTES
  *	  Because we can be doing an index scan on a relation while we
@@ -153,13 +153,13 @@ _hash_scantouched(IndexScanDesc scan,
 	if (ItemPointerIsValid(current)
 		&& ItemPointerGetBlockNumber(current) == blkno
 		&& ItemPointerGetOffsetNumber(current) >= offno)
-		return (true);
+		return true;
 
 	current = &(scan->currentMarkData);
 	if (ItemPointerIsValid(current)
 		&& ItemPointerGetBlockNumber(current) == blkno
 		&& ItemPointerGetOffsetNumber(current) >= offno)
-		return (true);
+		return true;
 
-	return (false);
+	return false;
 }

src/backend/access/hash/hashsearch.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.15 1998/06/15 19:27:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.16 1998/09/01 03:21:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -107,7 +107,7 @@ _hash_next(IndexScanDesc scan, ScanDirection dir)
 	 * next tuple, we come back with a lock on that buffer.
 	 */
 	if (!_hash_step(scan, &buf, dir, metabuf))
-		return ((RetrieveIndexResult) NULL);
+		return (RetrieveIndexResult) NULL;
 
 	/* if we're here, _hash_step found a valid tuple */
 	current = &(scan->currentItemData);
@@ -118,7 +118,7 @@ _hash_next(IndexScanDesc scan, ScanDirection dir)
 	itup = &hitem->hash_itup;
 	res = FormRetrieveIndexResult(current, &(itup->t_tid));
 
-	return (res);
+	return res;
 }
 
 static void
@@ -236,7 +236,7 @@ _hash_first(IndexScanDesc scan, ScanDirection dir)
 			{
 				_hash_relbuf(rel, buf, HASH_READ);
 				_hash_relbuf(rel, metabuf, HASH_READ);
-				return ((RetrieveIndexResult) NULL);
+				return (RetrieveIndexResult) NULL;
 			}
 		}
 	}
@@ -247,7 +247,7 @@ _hash_first(IndexScanDesc scan, ScanDirection dir)
 	}
 
 	if (!_hash_step(scan, &buf, dir, metabuf))
-		return ((RetrieveIndexResult) NULL);
+		return (RetrieveIndexResult) NULL;
 
 	/* if we're here, _hash_step found a valid tuple */
 	current = &(scan->currentItemData);
@@ -258,7 +258,7 @@ _hash_first(IndexScanDesc scan, ScanDirection dir)
 	itup = &hitem->hash_itup;
 	res = FormRetrieveIndexResult(current, &(itup->t_tid));
 
-	return (res);
+	return res;
 }
 
 /*
@@ -432,7 +432,7 @@ _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, Buffer metabuf)
 			_hash_relbuf(rel, metabuf, HASH_READ);
 			*bufP = so->hashso_curbuf = InvalidBuffer;
 			ItemPointerSetInvalid(current);
-			return (false);
+			return false;
 		}
 
 		/* get ready to check this tuple */
@@ -445,5 +445,5 @@ _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, Buffer metabuf)
 	blkno = BufferGetBlockNumber(buf);
 	*bufP = so->hashso_curbuf = buf;
 	ItemPointerSet(current, blkno, offnum);
-	return (true);
+	return true;
 }

src/backend/access/hash/hashstrat.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.11 1997/09/08 02:20:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.12 1998/09/01 03:21:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,7 +63,7 @@ _hash_getstrat(Relation rel,
 
 	Assert(StrategyNumberIsValid(strat));
 
-	return (strat);
+	return strat;
 }
 
 #endif

src/backend/access/hash/hashutil.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.13 1998/01/07 21:01:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.14 1998/09/01 03:21:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,7 @@ _hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap)
 	bool		null;
 
 	natts = rel->rd_rel->relnatts;
-	itupdesc = RelationGetTupleDescriptor(rel);
+	itupdesc = RelationGetDescr(rel);
 
 	skey = (ScanKey) palloc(natts * sizeof(ScanKeyData));
 
@@ -49,7 +49,7 @@ _hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap)
 							   0x0, (AttrNumber) (i + 1), proc, arg);
 	}
 
-	return (skey);
+	return skey;
 }
 
 void
@@ -64,10 +64,10 @@ _hash_checkqual(IndexScanDesc scan, IndexTuple itup)
 {
 	if (scan->numberOfKeys > 0)
 		return (index_keytest(itup,
-							  RelationGetTupleDescriptor(scan->relation),
+							  RelationGetDescr(scan->relation),
 							  scan->numberOfKeys, scan->keyData));
 	else
-		return (true);
+		return true;
 }
 
 HashItem
@@ -89,7 +89,7 @@ _hash_formitem(IndexTuple itup)
 	hitem = (HashItem) palloc(nbytes_hitem);
 	memmove((char *) &(hitem->hash_itup), (char *) itup, tuplen);
 
-	return (hitem);
+	return hitem;
 }
 
 Bucket
@@ -104,7 +104,7 @@ _hash_call(Relation rel, HashMetaPage metap, Datum key)
 	bucket = n & metap->hashm_highmask;
 	if (bucket > metap->hashm_maxbucket)
 		bucket = bucket & metap->hashm_lowmask;
-	return (bucket);
+	return bucket;
 }
 
 /*
@@ -119,7 +119,7 @@ _hash_log2(uint32 num)
 	limit = 1;
 	for (i = 0; limit < num; limit = limit << 1, i++)
 		;
-	return (i);
+	return i;
 }
 
 /*

src/backend/access/heap/heapam.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.33 1998/08/20 22:07:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.34 1998/09/01 03:21:05 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -194,7 +194,7 @@ unpinscan(HeapScanDesc scan)
 static int
 nextpage(int page, int dir)
 {
-	return ((dir < 0) ? page - 1 : page + 1);
+	return (dir < 0) ? page - 1 : page + 1;
 }
 
 /* ----------------
@@ -268,7 +268,7 @@ heapgettup(Relation relation,
 	 * ----------------
 	 */
 	if (!(pages = relation->rd_nblocks))
-		return (NULL);
+		return NULL;
 
 	/* ----------------
 	 *	calculate next starting lineoff, given scan direction
@@ -284,7 +284,7 @@ heapgettup(Relation relation,
 		if (ItemPointerIsValid(tid) == false)
 		{
 			*buf= InvalidBuffer;
-			return (NULL);
+			return NULL;
 		}
 		*buf = RelationGetBufferWithBuffer(relation,
 										 ItemPointerGetBlockNumber(tid),
@@ -300,7 +300,7 @@ heapgettup(Relation relation,
 		lpp = PageGetItemId(dp, lineoff);
 
 		rtup = (HeapTuple) PageGetItem((Page) dp, lpp);
-		return (rtup);
+		return rtup;
 
 	}
 	else if (dir < 0)
@@ -322,7 +322,7 @@ heapgettup(Relation relation,
 		if (page < 0)
 		{
 			*buf = InvalidBuffer;
-			return (NULL);
+			return NULL;
 		}
 
 		*buf = RelationGetBufferWithBuffer(relation, page, *buf);
@@ -366,7 +366,7 @@ heapgettup(Relation relation,
 		if (page >= pages)
 		{
 			*buf = InvalidBuffer;
-			return (NULL);
+			return NULL;
 		}
 		/* page and lineoff now reference the physically next tid */
 
@@ -420,7 +420,7 @@ heapgettup(Relation relation,
 					 */
 					ItemPointerSetBlockNumber(iptr, page);
 				}
-				return (rtup);
+				return rtup;
 			}
 
 			/* ----------------
@@ -455,7 +455,7 @@ heapgettup(Relation relation,
 			if (BufferIsValid(*buf))
 				ReleaseBuffer(*buf);
 			*buf = InvalidBuffer;
-			return (NULL);
+			return NULL;
 		}
 
 		*buf = ReleaseAndReadBuffer(*buf, relation, page);
@@ -526,7 +526,7 @@ heap_open(Oid relationId)
 	if (RelationIsValid(r) && r->rd_rel->relkind == RELKIND_INDEX)
 		elog(ERROR, "%s is an index relation", r->rd_rel->relname.data);
 
-	return (r);
+	return r;
 }
 
 /* ----------------
@@ -553,7 +553,7 @@ heap_openr(char *relationName)
 	if (RelationIsValid(r) && r->rd_rel->relkind == RELKIND_INDEX)
 		elog(ERROR, "%s is an index relation", r->rd_rel->relname.data);
 
-	return (r);
+	return r;
 }
 
 /* ----------------
@@ -646,7 +646,7 @@ heap_beginscan(Relation relation,
 	scan->rs_snapshot = snapshot;
 	scan->rs_nkeys = (short) nkeys;
 
-	return (scan);
+	return scan;
 }
 
 /* ----------------
@@ -806,7 +806,7 @@ heap_getnext(HeapScanDesc scandesc, int backw)
 		{
 			if (BufferIsValid(scan->rs_nbuf))
 				ReleaseBuffer(scan->rs_nbuf);
-			return (NULL);
+			return NULL;
 		}
 
 		/*
@@ -871,7 +871,7 @@ heap_getnext(HeapScanDesc scandesc, int backw)
 				ReleaseBuffer(scan->rs_nbuf);
 			scan->rs_ntup = NULL;
 			scan->rs_nbuf = InvalidBuffer;
-			return (NULL);
+			return NULL;
 		}
 
 		if (BufferIsValid(scan->rs_pbuf))
@@ -892,7 +892,7 @@ heap_getnext(HeapScanDesc scandesc, int backw)
 			if (BufferIsValid(scan->rs_pbuf))
 				ReleaseBuffer(scan->rs_pbuf);
 			HEAPDEBUG_3;		/* heap_getnext returns NULL at end */
-			return (NULL);
+			return NULL;
 		}
 
 		/*
@@ -959,7 +959,7 @@ heap_getnext(HeapScanDesc scandesc, int backw)
 			scan->rs_ptup = NULL;
 			scan->rs_pbuf = InvalidBuffer;
 			HEAPDEBUG_6;		/* heap_getnext returning EOS */
-			return (NULL);
+			return NULL;
 		}
 
 		if (BufferIsValid(scan->rs_nbuf))
@@ -1064,7 +1064,7 @@ heap_fetch(Relation relation,
 	if (tuple == NULL)
 	{
 		ReleaseBuffer(buffer);
-		return (NULL);
+		return NULL;
 	}
 
 	/* ----------------
@@ -1076,7 +1076,7 @@ heap_fetch(Relation relation,
 
 	*userbuf = buffer;	/* user is required to ReleaseBuffer() this */
 
-	return (tuple);
+	return tuple;
 }
 
 /* ----------------
@@ -1150,7 +1150,7 @@ heap_insert(Relation relation, HeapTuple tup)
 		SetRefreshWhenInvalidate((bool) !ImmediateInvalidation);
 	}
 
-	return (tup->t_oid);
+	return tup->t_oid;
 }
 
 /* ----------------
@@ -1213,7 +1213,7 @@ heap_delete(Relation relation, ItemPointer tid)
 		if (IsSystemRelationName(RelationGetRelationName(relation)->data))
 			RelationUnsetLockForWrite(relation);
 		ReleaseBuffer(buf);
-		return (1);
+		return 1;
 	}
 	/* ----------------
 	 *	check that we're deleteing a valid item
@@ -1256,7 +1256,7 @@ heap_delete(Relation relation, ItemPointer tid)
 	if (IsSystemRelationName(RelationGetRelationName(relation)->data))
 		RelationUnsetLockForWrite(relation);
 
-	return (0);
+	return 0;
 }
 
 /* ----------------
@@ -1339,7 +1339,7 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple replace_tuple)
 		if (IsSystemRelationName(RelationGetRelationName(relation)->data))
 			RelationUnsetLockForWrite(relation);
 		ReleaseBuffer(buffer);
-		return (1);
+		return 1;
 	}
 
 	/* ----------------
@@ -1411,7 +1411,7 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple replace_tuple)
 	if (IsSystemRelationName(RelationGetRelationName(relation)->data))
 		RelationUnsetLockForWrite(relation);
 
-	return (0);
+	return 0;
 }
 
 /* ----------------

src/backend/access/index/genam.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.13 1998/08/19 02:01:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.14 1998/09/01 03:21:07 momjian Exp $
  *
  * NOTES
  *	  many of the old access method routines have been turned into
@@ -123,7 +123,7 @@ RelationGetIndexScan(Relation relation,
 
 	index_rescan(scan, scanFromEnd, key);
 
-	return (scan);
+	return scan;
 }
 
 #ifdef NOT_USED

src/backend/access/index/indexam.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.23 1998/08/19 02:01:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.24 1998/09/01 03:21:09 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relationId
@@ -207,7 +207,7 @@ index_insert(Relation relation,
 	 * ----------------
 	 */
 
-	return (specificResult);
+	return specificResult;
 }
 
 /* ----------------
@@ -366,14 +366,14 @@ index_getprocid(Relation irel,
 
 	Assert(loc != NULL);
 
-	return (loc[(natts * (procnum - 1)) + (attnum - 1)]);
+	return loc[(natts * (procnum - 1)) + (attnum - 1)];
 }
 
 Datum
 GetIndexValue(HeapTuple tuple,
 			  TupleDesc hTupDesc,
 			  int attOff,
-			  AttrNumber attrNums[],
+			  AttrNumber *attrNums,
 			  FuncIndexInfo *fInfo,
 			  bool *attNull)
 {

src/backend/access/index/istrat.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.26 1998/08/19 02:01:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.27 1998/09/01 03:21:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,7 +74,7 @@ StrategyMapGetScanKeyEntry(StrategyMap map,
 {
 	Assert(StrategyMapIsValid(map));
 	Assert(StrategyNumberIsValid(strategyNumber));
-	return (&map->entry[strategyNumber - 1]);
+	return &map->entry[strategyNumber - 1];
 }
 
 /*
@@ -515,7 +515,7 @@ OperatorRelationFillScanKeyEntry(Relation operatorRelation,
 	}
 
 	entry->sk_flags = 0;
-	entry->sk_procedure = ((OperatorTupleForm) GETSTRUCT(tuple))->oprcode;
+	entry->sk_procedure = ((Form_pg_operator) GETSTRUCT(tuple))->oprcode;
 	fmgr_info(entry->sk_procedure, &entry->sk_func);
 	entry->sk_nargs = entry->sk_func.fn_nargs;
 
@@ -578,13 +578,13 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
 
 	/*
 	 * XXX note that the following assumes the INDEX tuple is well formed
-	 * and that the key[] and class[] are 0 terminated.
+	 * and that the *key and *class are 0 terminated.
 	 */
 	for (attributeIndex = 0; attributeIndex < maxAttributeNumber; attributeIndex++)
 	{
-		IndexTupleForm iform;
+		Form_pg_index iform;
 
-		iform = (IndexTupleForm) GETSTRUCT(tuple);
+		iform = (Form_pg_index) GETSTRUCT(tuple);
 
 		if (!OidIsValid(iform->indkey[attributeIndex]))
 		{

src/backend/access/nbtree/nbtcompare.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.17 1998/08/19 02:01:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.18 1998/09/01 03:21:12 momjian Exp $
  *
  *	NOTES
  *		These functions are stored in pg_amproc.  For each operator class
@@ -85,7 +85,7 @@ btoidcmp(Oid a, Oid b)
 }
 
 int32
-btoid8cmp(Oid a[], Oid b[])
+btoid8cmp(Oid *a, Oid *b)
 {
 	int i;
 	for (i=0; i < 8; i++)

src/backend/access/nbtree/nbtinsert.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.28 1998/08/19 02:01:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.29 1998/09/01 03:21:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -104,7 +104,7 @@ _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel
 			Buffer		nbuf;
 			BlockNumber blkno;
 
-			itupdesc = RelationGetTupleDescriptor(rel);
+			itupdesc = RelationGetDescr(rel);
 			nbuf = InvalidBuffer;
 			opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 
@@ -182,7 +182,7 @@ _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel
 	_bt_freestack(stack);
 	_bt_freeskey(itup_scankey);
 
-	return (res);
+	return res;
 }
 
 /*
@@ -301,7 +301,7 @@ _bt_insertonpg(Relation rel,
 									 keysz, scankey, stack->bts_btitem,
 									 NULL);
 				ItemPointerSet(&(res->pointerData), itup_blkno, itup_off);
-				return (res);
+				return res;
 			}
 		}
 		else
@@ -780,7 +780,7 @@ _bt_insertonpg(Relation rel,
 	res = (InsertIndexResult) palloc(sizeof(InsertIndexResultData));
 	ItemPointerSet(&(res->pointerData), itup_blkno, itup_off);
 
-	return (res);
+	return res;
 }
 
 /*
@@ -961,7 +961,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright)
 	}
 
 	/* split's done */
-	return (rbuf);
+	return rbuf;
 }
 
 /*
@@ -1045,7 +1045,7 @@ _bt_findsplitloc(Relation rel,
 	if (saferight == maxoff && (maxoff - start) > 1)
 		saferight = start + (maxoff - start) / 2;
 
-	return (saferight);
+	return saferight;
 }
 
 /*
@@ -1193,7 +1193,7 @@ _bt_pgaddtup(Relation rel,
 	/* write the buffer, but hold our lock */
 	_bt_wrtnorelbuf(rel, buf);
 
-	return (itup_off);
+	return itup_off;
 }
 
 /*
@@ -1227,7 +1227,7 @@ _bt_goesonpg(Relation rel,
 	/* no right neighbor? */
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 	if (P_RIGHTMOST(opaque))
-		return (true);
+		return true;
 
 	/*
 	 * this is a non-rightmost page, so it must have a high key item.
@@ -1237,7 +1237,7 @@ _bt_goesonpg(Relation rel,
 	 */
 	hikey = PageGetItemId(page, P_HIKEY);
 	if (_bt_skeycmp(rel, keysz, scankey, page, hikey, BTLessStrategyNumber))
-		return (true);
+		return true;
 
 	/*
 	 * If the scan key is > the high key, then it for sure doesn't belong
@@ -1245,7 +1245,7 @@ _bt_goesonpg(Relation rel,
 	 */
 
 	if (_bt_skeycmp(rel, keysz, scankey, page, hikey, BTGreaterStrategyNumber))
-		return (false);
+		return false;
 
 	/*
 	 * If we have no adjacency information, and the item is equal to the
@@ -1258,14 +1258,14 @@ _bt_goesonpg(Relation rel,
 	if (afteritem == (BTItem) NULL)
 	{
 		if (opaque->btpo_flags & BTP_LEAF)
-			return (false);
+			return false;
 		if (opaque->btpo_flags & BTP_CHAIN)
-			return (true);
+			return true;
 		if (_bt_skeycmp(rel, keysz, scankey, page,
 						PageGetItemId(page, P_FIRSTKEY),
 						BTEqualStrategyNumber))
-			return (true);
-		return (false);
+			return true;
+		return false;
 	}
 
 	/* damn, have to work for it.  i hate that. */
@@ -1293,7 +1293,7 @@ _bt_goesonpg(Relation rel,
 		}
 	}
 
-	return (found);
+	return found;
 }
 
 /*
@@ -1330,7 +1330,7 @@ _bt_itemcmp(Relation rel,
 		strat = BTGreaterStrategyNumber;
 	}
 
-	tupDes = RelationGetTupleDescriptor(rel);
+	tupDes = RelationGetDescr(rel);
 	indexTuple1 = &(item1->bti_itup);
 	indexTuple2 = &(item2->bti_itup);
 
@@ -1357,13 +1357,13 @@ _bt_itemcmp(Relation rel,
 		if (compare)			/* true for one of ">, <, =" */
 		{
 			if (strat != BTEqualStrategyNumber)
-				return (true);
+				return true;
 		}
 		else
 /* false for one of ">, <, =" */
 		{
 			if (strat == BTEqualStrategyNumber)
-				return (false);
+				return false;
 
 			/*
 			 * if original strat was "<=, >=" OR "<, >" but some
@@ -1379,10 +1379,10 @@ _bt_itemcmp(Relation rel,
 				if (compare)	/* item1' and item2' attributes are equal */
 					continue;	/* - try to compare next attributes */
 			}
-			return (false);
+			return false;
 		}
 	}
-	return (true);
+	return true;
 }
 
 /*
@@ -1475,15 +1475,15 @@ _bt_isequal(TupleDesc itupdesc, Page page, OffsetNumber offnum,
 
 		/* NULLs are not equal */
 		if (entry->sk_flags & SK_ISNULL || null)
-			return (false);
+			return false;
 
 		result = (long) FMGR_PTR2(&entry->sk_func, entry->sk_argument, datum);
 		if (result != 0)
-			return (false);
+			return false;
 	}
 
 	/* by here, the keys are equal */
-	return (true);
+	return true;
 }
 
 #ifdef NOT_USED
@@ -1621,7 +1621,7 @@ _bt_shift(Relation rel, Buffer buf, BTStack stack, int keysz,
 
 	ItemPointerSet(&(res->pointerData), nbknum, P_HIKEY);
 
-	return (res);
+	return res;
 }
 
 #endif

src/backend/access/nbtree/nbtpage.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.15 1998/01/07 21:01:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.16 1998/09/01 03:21:14 momjian Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -274,7 +274,7 @@ _bt_getroot(Relation rel, int access)
 			 */
 
 			_bt_relbuf(rel, metabuf, BT_WRITE);
-			return (_bt_getroot(rel, access));
+			return _bt_getroot(rel, access);
 		}
 	}
 	else
@@ -298,7 +298,7 @@ _bt_getroot(Relation rel, int access)
 
 		/* it happened, try again */
 		_bt_relbuf(rel, rootbuf, access);
-		return (_bt_getroot(rel, access));
+		return _bt_getroot(rel, access);
 	}
 
 	/*
@@ -307,7 +307,7 @@ _bt_getroot(Relation rel, int access)
 	 * Return the root block.
 	 */
 
-	return (rootbuf);
+	return rootbuf;
 }
 
 /*
@@ -350,7 +350,7 @@ _bt_getbuf(Relation rel, BlockNumber blkno, int access)
 	}
 
 	/* ref count and lock type are correct */
-	return (buf);
+	return buf;
 }
 
 /*
@@ -505,7 +505,7 @@ _bt_getstackbuf(Relation rel, BTStack stack, int access)
 			item_save = (BTItem) palloc(item_nbytes);
 			memmove((char *) item_save, (char *) item, item_nbytes);
 			stack->bts_btitem = item_save;
-			return (buf);
+			return buf;
 		}
 
 		/* if the item has just moved right on this page, we're done */
@@ -525,7 +525,7 @@ _bt_getstackbuf(Relation rel, BTStack stack, int access)
 				item_save = (BTItem) palloc(item_nbytes);
 				memmove((char *) item_save, (char *) item, item_nbytes);
 				stack->bts_btitem = item_save;
-				return (buf);
+				return buf;
 			}
 		}
 	}
@@ -562,7 +562,7 @@ _bt_getstackbuf(Relation rel, BTStack stack, int access)
 				item_save = (BTItem) palloc(item_nbytes);
 				memmove((char *) item_save, (char *) item, item_nbytes);
 				stack->bts_btitem = item_save;
-				return (buf);
+				return buf;
 			}
 		}
 	}

src/backend/access/nbtree/nbtree.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.30 1998/08/25 21:33:56 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.31 1998/09/01 03:21:16 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -119,8 +119,8 @@ btbuild(Relation heap,
 		_bt_metapinit(index);
 
 	/* get tuple descriptors for heap and index relations */
-	htupdesc = RelationGetTupleDescriptor(heap);
-	itupdesc = RelationGetTupleDescriptor(index);
+	htupdesc = RelationGetDescr(heap);
+	itupdesc = RelationGetDescr(index);
 
 	/* get space for data items that'll appear in the index tuple */
 	attdata = (Datum *) palloc(natts * sizeof(Datum));
@@ -355,13 +355,14 @@ btinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation
 	InsertIndexResult res;
 
 	/* generate an index tuple */
-	itup = index_formtuple(RelationGetTupleDescriptor(rel), datum, nulls);
+	itup = index_formtuple(RelationGetDescr(rel), datum, nulls);
 	itup->t_tid = *ht_ctid;
 
 	/*
 	 * See comments in btbuild.
 	 *
-	 * if (itup->t_info & INDEX_NULL_MASK) return ((InsertIndexResult) NULL);
+	 * if (itup->t_info & INDEX_NULL_MASK)
+			return (InsertIndexResult) NULL;
 	 */
 
 	btitem = _bt_formitem(itup);
@@ -377,7 +378,7 @@ btinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation
 	_bt_adjscans(rel, &(res->pointerData), BT_INSERT);
 #endif
 
-	return (res);
+	return res;
 }
 
 /*
@@ -417,7 +418,7 @@ btgettuple(IndexScanDesc scan, ScanDirection dir)
 	if (res)
 		((BTScanOpaque)scan->opaque)->curHeapIptr = res->heap_iptr;
 	
-	return ((char *) res);
+	return (char *) res;
 }
 
 /*
@@ -434,7 +435,7 @@ btbeginscan(Relation rel, bool fromEnd, uint16 keysz, ScanKey scankey)
 	/* register scan in case we change pages it's using */
 	_bt_regscan(scan);
 
-	return ((char *) scan);
+	return (char *) scan;
 }
 
 /*

src/backend/access/nbtree/nbtscan.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.16 1998/08/19 02:01:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.17 1998/09/01 03:21:17 momjian Exp $
  *
  *
  * NOTES
@@ -231,13 +231,13 @@ _bt_scantouched(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno)
 	if (ItemPointerIsValid(current)
 		&& ItemPointerGetBlockNumber(current) == blkno
 		&& ItemPointerGetOffsetNumber(current) >= offno)
-		return (true);
+		return true;
 
 	current = &(scan->currentMarkData);
 	if (ItemPointerIsValid(current)
 		&& ItemPointerGetBlockNumber(current) == blkno
 		&& ItemPointerGetOffsetNumber(current) >= offno)
-		return (true);
+		return true;
 
-	return (false);
+	return false;
 }

src/backend/access/nbtree/nbtsort.c

@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: nbtsort.c,v 1.31 1998/08/25 21:33:57 scrappy Exp $
+ *	  $Id: nbtsort.c,v 1.32 1998/09/01 03:21:19 momjian Exp $
  *
  * NOTES
  *
@@ -180,11 +180,11 @@ _bt_isortcmp(BTSortKey *k1, BTSortKey *k2)
 	if (k1->btsk_item == (BTItem) NULL)
 	{
 		if (k2->btsk_item == (BTItem) NULL)
-			return (0);			/* 1 = 2 */
-		return (1);				/* 1 > 2 */
+			return 0;			/* 1 = 2 */
+		return 1;				/* 1 > 2 */
 	}
 	else if (k2->btsk_item == (BTItem) NULL)
-		return (-1);			/* 1 < 2 */
+		return -1;			/* 1 < 2 */
 
 	for (i = 0; i < _bt_nattr; i++)
 	{
@@ -195,17 +195,17 @@ _bt_isortcmp(BTSortKey *k1, BTSortKey *k2)
 				equal_isnull = true;
 				continue;
 			}
-			return (1);			/* NULL ">" NOT_NULL */
+			return 1;			/* NULL ">" NOT_NULL */
 		}
 		else if (k2_nulls[i] != ' ')	/* k2 attr is NULL */
-			return (-1);		/* NOT_NULL "<" NULL */
+			return -1;		/* NOT_NULL "<" NULL */
 
 		if (_bt_invokestrat(_bt_sortrel, i + 1, BTGreaterStrategyNumber,
 							k1_datum[i], k2_datum[i]))
-			return (1);			/* 1 > 2 */
+			return 1;			/* 1 > 2 */
 		else if (_bt_invokestrat(_bt_sortrel, i + 1, BTGreaterStrategyNumber,
 								 k2_datum[i], k1_datum[i]))
-			return (-1);		/* 1 < 2 */
+			return -1;		/* 1 < 2 */
 	}
 
 	if (_bt_inspool->isunique && !equal_isnull)
@@ -213,7 +213,7 @@ _bt_isortcmp(BTSortKey *k1, BTSortKey *k2)
 		_bt_spooldestroy((void *) _bt_inspool);
 		elog(ERROR, "Cannot create unique index. Table contains non-unique values");
 	}
-	return (0);					/* 1 = 2 */
+	return 0;					/* 1 = 2 */
 }
 
 static void
@@ -307,17 +307,17 @@ _bt_pqnext(BTPriQueue *q, BTPriQueueElem *e)
 {
 	if (q->btpq_nelem < 1)
 	{							/* already empty */
-		return (-1);
+		return -1;
 	}
 	*e = q->btpq_queue[0];		/* struct = */
 
 	if (--q->btpq_nelem < 1)
 	{							/* now empty, don't sift */
-		return (0);
+		return 0;
 	}
 	q->btpq_queue[0] = q->btpq_queue[q->btpq_nelem];	/* struct = */
 	_bt_pqsift(q, 0);
-	return (0);
+	return 0;
 }
 
 static void
@@ -426,7 +426,7 @@ _bt_tapecreate(char *fname)
 	/* initialize the buffer */
 	_bt_tapereset(tape);
 
-	return (tape);
+	return tape;
 }
 
 /*
@@ -468,7 +468,7 @@ _bt_taperead(BTTapeBlock *tape)
 
 	if (tape->bttb_eor)
 	{
-		return (0);				/* we are already at End-Of-Run */
+		return 0;				/* we are already at End-Of-Run */
 	}
 
 	/*
@@ -482,11 +482,11 @@ _bt_taperead(BTTapeBlock *tape)
 	if (nread != TAPEBLCKSZ)
 	{
 		Assert(nread == 0);		/* we are at EOF */
-		return (0);
+		return 0;
 	}
 	Assert(tape->bttb_magic == BTTAPEMAGIC);
 	NDirectFileRead += TAPEBLCKSZ / BLCKSZ;
-	return (1);
+	return 1;
 }
 
 /*
@@ -506,11 +506,11 @@ _bt_tapenext(BTTapeBlock *tape, char **pos)
 	BTItem		bti;
 
 	if (*pos >= tape->bttb_data + tape->bttb_top)
-		return ((BTItem) NULL);
+		return (BTItem) NULL;
 	bti = (BTItem) *pos;
 	itemsz = BTITEMSZ(bti);
 	*pos += DOUBLEALIGN(itemsz);
-	return (bti);
+	return bti;
 }
 
 /*
@@ -574,7 +574,7 @@ _bt_spoolinit(Relation index, int ntapes, bool isunique)
 
 	_bt_isortcmpinit(index, btspool);
 
-	return ((void *) btspool);
+	return (void *) btspool;
 }
 
 /*
@@ -838,7 +838,7 @@ _bt_pagestate(Relation index, int flags, int level, bool doupper)
 	state->btps_level = level;
 	state->btps_doupper = doupper;
 
-	return ((void *) state);
+	return (void *) state;
 }
 
 /*
@@ -859,7 +859,7 @@ _bt_minitem(Page opage, BlockNumber oblkno, int atend)
 	nbti = _bt_formitem(&(obti->bti_itup));
 	ItemPointerSet(&(nbti->bti_itup.t_tid), oblkno, P_HIKEY);
 
-	return (nbti);
+	return nbti;
 }
 
 /*
@@ -1074,7 +1074,7 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
 	state->btps_lastoff = last_off;
 	state->btps_firstoff = first_off;
 
-	return (last_bti);
+	return last_bti;
 }
 
 static void

src/backend/access/nbtree/nbtstrat.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.6 1997/09/08 02:20:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.7 1998/09/01 03:21:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -115,7 +115,7 @@ _bt_getstrat(Relation rel,
 
 	Assert(StrategyNumberIsValid(strat));
 
-	return (strat);
+	return strat;
 }
 
 bool

src/backend/access/nbtree/nbtutils.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.21 1998/08/19 02:01:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.22 1998/09/01 03:21:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,7 +44,7 @@ _bt_mkscankey(Relation rel, IndexTuple itup)
 	bits16		flag;
 
 	natts = rel->rd_rel->relnatts;
-	itupdesc = RelationGetTupleDescriptor(rel);
+	itupdesc = RelationGetDescr(rel);
 
 	skey = (ScanKey) palloc(natts * sizeof(ScanKeyData));
 
@@ -64,7 +64,7 @@ _bt_mkscankey(Relation rel, IndexTuple itup)
 		ScanKeyEntryInitialize(&skey[i], flag, (AttrNumber) (i + 1), proc, arg);
 	}
 
-	return (skey);
+	return skey;
 }
 
 void
@@ -306,7 +306,7 @@ _bt_formitem(IndexTuple itup)
 #ifndef BTREE_VERSION_1
 	btitem->bti_oid = newoid();
 #endif
-	return (btitem);
+	return btitem;
 }
 
 #ifdef NOT_USED
@@ -317,10 +317,10 @@ _bt_checkqual(IndexScanDesc scan, IndexTuple itup)
 
 	so = (BTScanOpaque) scan->opaque;
 	if (so->numberOfKeys > 0)
-		return (index_keytest(itup, RelationGetTupleDescriptor(scan->relation),
+		return (index_keytest(itup, RelationGetDescr(scan->relation),
 							  so->numberOfKeys, so->keyData));
 	else
-		return (true);
+		return true;
 }
 
 #endif
@@ -333,10 +333,10 @@ _bt_checkforkeys(IndexScanDesc scan, IndexTuple itup, Size keysz)
 
 	so = (BTScanOpaque) scan->opaque;
 	if (keysz > 0 && so->numberOfKeys >= keysz)
-		return (index_keytest(itup, RelationGetTupleDescriptor(scan->relation),
+		return (index_keytest(itup, RelationGetDescr(scan->relation),
 							  keysz, so->keyData));
 	else
-		return (true);
+		return true;
 }
 
 #endif
@@ -354,10 +354,10 @@ _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size *keysok)
 
 	*keysok = 0;
 	if (keysz == 0)
-		return (true);
+		return true;
 
 	key = so->keyData;
-	tupdesc = RelationGetTupleDescriptor(scan->relation);
+	tupdesc = RelationGetDescr(scan->relation);
 
 	IncrIndexProcessed();
 
@@ -370,7 +370,7 @@ _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size *keysok)
 
 		/* btree doesn't support 'A is null' clauses, yet */
 		if (isNull || key[0].sk_flags & SK_ISNULL)
-			return (false);
+			return false;
 
 		if (key[0].sk_flags & SK_COMMUTE)
 		{
@@ -386,12 +386,12 @@ _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size *keysok)
 		}
 
 		if (!test == !(key[0].sk_flags & SK_NEGATE))
-			return (false);
+			return false;
 
 		keysz -= 1;
 		key++;
 		(*keysok)++;
 	}
 
-	return (true);
+	return true;
 }

src/backend/access/rtree/rtget.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.10 1998/06/15 19:28:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.11 1998/09/01 03:21:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,14 +43,14 @@ rtgettuple(IndexScanDesc s, ScanDirection dir)
 
 	/* if we have it cached in the scan desc, just return the value */
 	if ((res = rtscancache(s, dir)) != (RetrieveIndexResult) NULL)
-		return (res);
+		return res;
 
 	/* not cached, so we'll have to do some work */
 	if (ItemPointerIsValid(&(s->currentItemData)))
 		res = rtnext(s, dir);
 	else
 		res = rtfirst(s, dir);
-	return (res);
+	return res;
 }
 
 static RetrieveIndexResult
@@ -85,7 +85,7 @@ rtfirst(IndexScanDesc s, ScanDirection dir)
 
 			ReleaseBuffer(b);
 			if (so->s_stack == (RTSTACK *) NULL)
-				return ((RetrieveIndexResult) NULL);
+				return (RetrieveIndexResult) NULL;
 
 			stk = so->s_stack;
 			b = ReadBuffer(s->relation, stk->rts_blk);
@@ -111,7 +111,7 @@ rtfirst(IndexScanDesc s, ScanDirection dir)
 			res = FormRetrieveIndexResult(&(s->currentItemData), &(it->t_tid));
 
 			ReleaseBuffer(b);
-			return (res);
+			return res;
 		}
 		else
 		{
@@ -169,7 +169,7 @@ rtnext(IndexScanDesc s, ScanDirection dir)
 
 			ReleaseBuffer(b);
 			if (so->s_stack == (RTSTACK *) NULL)
-				return ((RetrieveIndexResult) NULL);
+				return (RetrieveIndexResult) NULL;
 
 			stk = so->s_stack;
 			b = ReadBuffer(s->relation, stk->rts_blk);
@@ -195,7 +195,7 @@ rtnext(IndexScanDesc s, ScanDirection dir)
 			res = FormRetrieveIndexResult(&(s->currentItemData), &(it->t_tid));
 
 			ReleaseBuffer(b);
-			return (res);
+			return res;
 		}
 		else
 		{
@@ -250,14 +250,14 @@ findnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir)
 		if (po->flags & F_LEAF)
 		{
 			if (index_keytest(it,
-							  RelationGetTupleDescriptor(s->relation),
+							  RelationGetDescr(s->relation),
 							  s->numberOfKeys, s->keyData))
 				break;
 		}
 		else
 		{
 			if (index_keytest(it,
-							  RelationGetTupleDescriptor(s->relation),
+							  RelationGetDescr(s->relation),
 							  so->s_internalNKey, so->s_internalKey))
 				break;
 		}
@@ -268,7 +268,7 @@ findnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir)
 			n = OffsetNumberNext(n);
 	}
 
-	return (n);
+	return n;
 }
 
 static RetrieveIndexResult
@@ -281,7 +281,7 @@ rtscancache(IndexScanDesc s, ScanDirection dir)
 		  && ItemPointerIsValid(&(s->currentItemData))))
 	{
 
-		return ((RetrieveIndexResult) NULL);
+		return (RetrieveIndexResult) NULL;
 	}
 
 	ip = rtheapptr(s->relation, &(s->currentItemData));
@@ -293,7 +293,7 @@ rtscancache(IndexScanDesc s, ScanDirection dir)
 
 	pfree(ip);
 
-	return (res);
+	return res;
 }
 
 /*
@@ -323,5 +323,5 @@ rtheapptr(Relation r, ItemPointer itemp)
 	else
 		ItemPointerSetInvalid(ip);
 
-	return (ip);
+	return ip;
 }

src/backend/access/rtree/rtproc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.16 1998/02/26 04:30:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.17 1998/09/01 03:21:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,7 +36,7 @@ rt_box_union(BOX *a, BOX *b)
 	n->low.x = Min(a->low.x, b->low.x);
 	n->low.y = Min(a->low.y, b->low.y);
 
-	return (n);
+	return n;
 }
 
 BOX *
@@ -55,10 +55,10 @@ rt_box_inter(BOX *a, BOX *b)
 	if (n->high.x < n->low.x || n->high.y < n->low.y)
 	{
 		pfree(n);
-		return ((BOX *) NULL);
+		return (BOX *) NULL;
 	}
 
-	return (n);
+	return n;
 }
 
 void
@@ -149,8 +149,8 @@ rt_poly_inter(POLYGON *a, POLYGON *b)
 	if (p->boundbox.high.x < p->boundbox.low.x || p->boundbox.high.y < p->boundbox.low.y)
 	{
 		pfree(p);
-		return ((POLYGON *) NULL);
+		return (POLYGON *) NULL;
 	}
 
-	return (p);
+	return p;
 }

src/backend/access/rtree/rtree.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.26 1998/08/19 02:01:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.27 1998/09/01 03:21:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -136,8 +136,8 @@ rtbuild(Relation heap,
 	}
 
 	/* init the tuple descriptors and get set for a heap scan */
-	hd = RelationGetTupleDescriptor(heap);
-	id = RelationGetTupleDescriptor(index);
+	hd = RelationGetDescr(heap);
+	id = RelationGetDescr(index);
 	d = (Datum *) palloc(natts * sizeof(*d));
 	nulls = (bool *) palloc(natts * sizeof(*nulls));
 
@@ -310,7 +310,7 @@ rtinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation he
 	RTSTATE		rtState;
 
 	/* generate an index tuple */
-	itup = index_formtuple(RelationGetTupleDescriptor(r), datum, nulls);
+	itup = index_formtuple(RelationGetDescr(r), datum, nulls);
 	itup->t_tid = *ht_ctid;
 	initRtstate(&rtState, r);
 
@@ -318,7 +318,7 @@ rtinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation he
 	res = rtdoinsert(r, itup, &rtState);
 
 	/* XXX two-phase locking -- don't unlock the relation until EOT */
-	return (res);
+	return res;
 }
 
 static InsertIndexResult
@@ -372,7 +372,7 @@ rtdoinsert(Relation r, IndexTuple itup, RTSTATE *rtstate)
 		res = dosplit(r, buffer, stack, itup, rtstate);
 		freestack(stack);
 		WriteBuffer(buffer);	/* don't forget to release buffer! */
-		return (res);
+		return res;
 	}
 
 	/* add the item and write the buffer */
@@ -402,7 +402,7 @@ rtdoinsert(Relation r, IndexTuple itup, RTSTATE *rtstate)
 	res = (InsertIndexResult) palloc(sizeof(InsertIndexResultData));
 	ItemPointerSet(&(res->pointerData), blk, l);
 
-	return (res);
+	return res;
 }
 
 static void
@@ -435,7 +435,7 @@ rttighten(Relation r,
 
 	if (newd_size != old_size)
 	{
-		TupleDesc	td = RelationGetTupleDescriptor(r);
+		TupleDesc	td = RelationGetDescr(r);
 
 		if (td->attrs[0]->attlen < 0)
 		{
@@ -620,7 +620,7 @@ dosplit(Relation r,
 	pfree(ltup);
 	pfree(rtup);
 
-	return (res);
+	return res;
 }
 
 static void
@@ -922,13 +922,13 @@ choose(Relation r, Page p, IndexTuple it, RTSTATE *rtstate)
 		}
 	}
 
-	return (which);
+	return which;
 }
 
 static int
 nospace(Page p, IndexTuple it)
 {
-	return (PageGetFreeSpace(p) < IndexTupleSize(it));
+	return PageGetFreeSpace(p) < IndexTupleSize(it);
 }
 
 void
@@ -970,7 +970,7 @@ rtdelete(Relation r, ItemPointer tid)
 	WriteBuffer(buf);
 
 	/* XXX -- two-phase locking, don't release the write lock */
-	return ((char *) NULL);
+	return (char *) NULL;
 }
 
 static void

src/backend/access/rtree/rtscan.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.17 1998/08/19 02:01:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.18 1998/09/01 03:21:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -73,7 +73,7 @@ rtbeginscan(Relation r,
 	s = RelationGetIndexScan(r, fromEnd, nkeys, key);
 	rtregscan(s);
 
-	return (s);
+	return s;
 }
 
 void

src/backend/access/rtree/rtstrat.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.8 1997/09/08 02:21:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.9 1998/09/01 03:21:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -209,7 +209,7 @@ RelationGetRTStrategy(Relation r,
 					  AttrNumber attnum,
 					  RegProcedure proc)
 {
-	return (RelationGetStrategy(r, attnum, &RTEvaluationData, proc));
+	return RelationGetStrategy(r, attnum, &RTEvaluationData, proc);
 }
 
 #ifdef NOT_USED
@@ -239,5 +239,5 @@ RTMapOperator(Relation r,
 											  RTNStrategies,
 											  attnum);
 
-	return (strategyMap->entry[RTOperMap[procstrat - 1] - 1].sk_procedure);
+	return strategyMap->entry[RTOperMap[procstrat - 1] - 1].sk_procedure;
 }

src/backend/access/transam/transam.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.17 1998/02/26 04:30:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.18 1998/09/01 03:21:31 momjian Exp $
  *
  * NOTES
  *	  This file contains the high level access-method interface to the
@@ -188,7 +188,7 @@ TransactionLogTest(TransactionId transactionId, /* transaction id to test */
 	/*
 	 * so lint is happy...
 	 */
-	return (false);
+	return false;
 }
 
 /* --------------------------------

src/backend/access/transam/xact.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.21 1998/07/21 04:17:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.22 1998/09/01 03:21:33 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -295,7 +295,7 @@ IsTransactionState(void)
 	/*
 	 * Shouldn't get here, but lint is not happy with this...
 	 */
-	return (false);
+	return false;
 }
 
 /* --------------------------------
@@ -863,7 +863,7 @@ StartTransaction()
 bool
 CurrentXactInProgress()
 {
-	return (CurrentTransactionState->state == TRANS_INPROGRESS);
+	return CurrentTransactionState->state == TRANS_INPROGRESS;
 }
 
 /* --------------------------------
@@ -1462,7 +1462,7 @@ IsTransactionBlock()
 
 	if (s->blockState == TBLOCK_INPROGRESS
 		|| s->blockState == TBLOCK_ENDABORT)
-		return (true);
+		return true;
 
-	return (false);
+	return false;
 }

src/backend/access/transam/xid.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.16 1998/04/26 04:05:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.17 1998/09/01 03:21:34 momjian Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -34,7 +34,7 @@ extern TransactionId FirstTransactionId;
 TransactionId
 xidin(char *representation)
 {
-	return (atol(representation));
+	return atol(representation);
 }
 
 /* XXX name for catalogs */
@@ -49,7 +49,7 @@ xidout(TransactionId transactionId)
 
 	sprintf(representation, "%u", transactionId);
 
-	return (representation);
+	return representation;
 
 }
 
@@ -60,7 +60,7 @@ xidout(TransactionId transactionId)
 bool
 TransactionIdIsLessThan(TransactionId id1, TransactionId id2)
 {
-	return ((bool) (id1 < id2));
+	return (bool) (id1 < id2);
 }
 
 /* ----------------------------------------------------------------
@@ -75,7 +75,7 @@ TransactionIdIsLessThan(TransactionId id1, TransactionId id2)
 bool
 xideq(TransactionId xid1, TransactionId xid2)
 {
-	return ((bool) (xid1 == xid2));
+	return (bool) (xid1 == xid2);
 }
 
 

src/backend/bootstrap/bootstrap.c

@@ -7,7 +7,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.49 1998/08/24 19:04:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.50 1998/09/01 03:21:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -86,7 +86,7 @@
 
 extern int	Int_yyparse(void);
 static hashnode *AddStr(char *str, int strlength, int mderef);
-static AttributeTupleForm AllocateAttribute(void);
+static Form_pg_attribute AllocateAttribute(void);
 static bool BootstrapAlreadySeen(Oid id);
 static int	CompHash(char *str, int len);
 static hashnode *FindStr(char *str, int length, hashnode *mderef);
@@ -165,7 +165,7 @@ static int	n_types = sizeof(Procid) / sizeof(struct typinfo);
 struct typmap
 {								/* a hack */
 	Oid			am_oid;
-	TypeTupleFormData am_typ;
+	FormData_pg_type am_typ;
 };
 
 static struct typmap **Typ = (struct typmap **) NULL;
@@ -176,7 +176,7 @@ static char Blanks[MAXATTR];
 
 static char *relname;			/* current relation name */
 
-AttributeTupleForm attrtypes[MAXATTR];	/* points to attribute info */
+Form_pg_attribute attrtypes[MAXATTR];	/* points to attribute info */
 static char *values[MAXATTR];	/* cooresponding attribute values */
 int			numattr;			/* number of attributes for cur. rel */
 extern int	fsyncOff;			/* do not fsync the database */
@@ -394,7 +394,7 @@ BootstrapMain(int argc, char *argv[])
 
 	for (i = 0; i < MAXATTR; i++)
 	{
-		attrtypes[i] = (AttributeTupleForm) NULL;
+		attrtypes[i] = (Form_pg_attribute) NULL;
 		Blanks[i] = ' ';
 	}
 	for (i = 0; i < STRTABLESIZE; ++i)
@@ -514,7 +514,7 @@ boot_openrel(char *relname)
 
 		if (DebugMode)
 		{
-			AttributeTupleForm at = attrtypes[i];
+			Form_pg_attribute at = attrtypes[i];
 
 			printf("create attribute %d name %s len %d num %d type %d\n",
 				   i, at->attname.data, at->attlen, at->attnum,
@@ -580,7 +580,7 @@ DefineAttr(char *name, char *type, int attnum)
 	}
 
 	typeoid = gettype(type);
-	if (attrtypes[attnum] == (AttributeTupleForm) NULL)
+	if (attrtypes[attnum] == (Form_pg_attribute) NULL)
 		attrtypes[attnum] = AllocateAttribute();
 	if (Typ != (struct typmap **) NULL)
 	{
@@ -757,7 +757,7 @@ BootstrapAlreadySeen(Oid id)
 		seenArray[nseen] = id;
 		nseen++;
 	}
-	return (seenthis);
+	return seenthis;
 }
 
 /* ----------------
@@ -802,7 +802,7 @@ gettype(char *type)
 			if (strncmp((*app)->am_typ.typname.data, type, NAMEDATALEN) == 0)
 			{
 				Ap = *app;
-				return ((*app)->am_oid);
+				return (*app)->am_oid;
 			}
 		}
 	}
@@ -811,7 +811,7 @@ gettype(char *type)
 		for (i = 0; i <= n_types; i++)
 		{
 			if (strncmp(type, Procid[i].name, NAMEDATALEN) == 0)
-				return (i);
+				return i;
 		}
 		if (DebugMode)
 			printf("bootstrap.c: External Type: %s\n", type);
@@ -836,7 +836,7 @@ gettype(char *type)
 		}
 		heap_endscan(scan);
 		heap_close(rel);
-		return (gettype(type));
+		return gettype(type);
 	}
 	elog(ERROR, "Error: unknown type '%s'.\n", type);
 	err_out();
@@ -848,17 +848,17 @@ gettype(char *type)
  *		AllocateAttribute
  * ----------------
  */
-static AttributeTupleForm		/* XXX */
+static Form_pg_attribute		/* XXX */
 AllocateAttribute()
 {
-	AttributeTupleForm attribute =
-	(AttributeTupleForm) malloc(ATTRIBUTE_TUPLE_SIZE);
+	Form_pg_attribute attribute =
+	(Form_pg_attribute) malloc(ATTRIBUTE_TUPLE_SIZE);
 
 	if (!PointerIsValid(attribute))
 		elog(FATAL, "AllocateAttribute: malloc failed");
 	MemSet(attribute, 0, ATTRIBUTE_TUPLE_SIZE);
 
-	return (attribute);
+	return attribute;
 }
 
 /* ----------------
@@ -912,11 +912,11 @@ EnterString(char *str)
 
 	node = FindStr(str, len, 0);
 	if (node)
-		return (node->strnum);
+		return node->strnum;
 	else
 	{
 		node = AddStr(str, len, 0);
-		return (node->strnum);
+		return node->strnum;
 	}
 }
 
@@ -929,7 +929,7 @@ EnterString(char *str)
 char *
 LexIDStr(int ident_num)
 {
-	return (strtable[ident_num]);
+	return strtable[ident_num];
 }
 
 
@@ -949,7 +949,7 @@ CompHash(char *str, int len)
 
 	result = (NUM * str[0] + NUMSQR * str[len - 1] + NUMCUBE * str[(len - 1) / 2]);
 
-	return (result % HASHTABLESIZE);
+	return result % HASHTABLESIZE;
 
 }
 
@@ -976,13 +976,13 @@ FindStr(char *str, int length, hashnode *mderef)
 		 */
 		if (!strcmp(str, strtable[node->strnum]))
 		{
-			return (node);		/* no need to check */
+			return node;		/* no need to check */
 		}
 		else
 			node = node->next;
 	}
 	/* Couldn't find it in the list */
-	return (NULL);
+	return NULL;
 }
 
 /* ----------------
@@ -1048,7 +1048,7 @@ AddStr(char *str, int strlength, int mderef)
 		}
 		trail->next = newnode;
 	}
-	return (newnode);
+	return newnode;
 }
 
 

src/backend/catalog/aclchk.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.14 1998/08/19 02:01:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.15 1998/09/01 03:21:38 momjian Exp $
  *
  * NOTES
  *	  See acl.h.
@@ -130,7 +130,7 @@ ChangeAcl(char *relname,
 	if (!heap_attisnull(tuple, Anum_pg_class_relacl))
 		old_acl = (Acl *) heap_getattr(tuple,
 									   Anum_pg_class_relacl,
-									   RelationGetTupleDescriptor(relation),
+									   RelationGetDescr(relation),
 									   (bool *) NULL);
 	if (!old_acl || ACL_NUM(old_acl) < 1)
 	{
@@ -190,7 +190,7 @@ get_grosysid(char *groname)
 		id = ((Form_pg_group) GETSTRUCT(tuple))->grosysid;
 	else
 		elog(ERROR, "non-existent group \"%s\"", groname);
-	return (id);
+	return id;
 }
 
 char *
@@ -206,7 +206,7 @@ get_groname(AclId grosysid)
 		name = (((Form_pg_group) GETSTRUCT(tuple))->groname).data;
 	else
 		elog(NOTICE, "get_groname: group %d not found", grosysid);
-	return (name);
+	return name;
 }
 
 static int32
@@ -225,7 +225,7 @@ in_group(AclId uid, AclId gid)
 	{
 		elog(NOTICE, "in_group: could not open \"%s\"??",
 			 GroupRelationName);
-		return (0);
+		return 0;
 	}
 	tuple = SearchSysCacheTuple(GROSYSID,
 								ObjectIdGetDatum(gid),
@@ -235,7 +235,7 @@ in_group(AclId uid, AclId gid)
 	{
 		tmp = (IdList *) heap_getattr(tuple,
 									  Anum_pg_group_grolist,
-									RelationGetTupleDescriptor(relation),
+									RelationGetDescr(relation),
 									  (bool *) NULL);
 		/* XXX make me a function */
 		num = IDLIST_NUM(tmp);
@@ -250,7 +250,7 @@ in_group(AclId uid, AclId gid)
 	else
 		elog(NOTICE, "in_group: group %d not found", gid);
 	heap_close(relation);
-	return (found);
+	return found;
 }
 
 /*
@@ -300,7 +300,7 @@ aclcheck(char *relname, Acl *acl, AclId id, AclIdType idtype, AclMode mode)
 					elog(DEBUG, "aclcheck: found %d/%d",
 						 aip->ai_id, aip->ai_mode);
 #endif
-					return ((aip->ai_mode & mode) ? ACLCHECK_OK : ACLCHECK_NO_PRIV);
+					return (aip->ai_mode & mode) ? ACLCHECK_OK : ACLCHECK_NO_PRIV;
 				}
 			}
 			for (found_group = 0;
@@ -340,7 +340,7 @@ aclcheck(char *relname, Acl *acl, AclId id, AclIdType idtype, AclMode mode)
 					elog(DEBUG, "aclcheck: found %d/%d",
 						 aip->ai_id, aip->ai_mode);
 #endif
-					return ((aip->ai_mode & mode) ? ACLCHECK_OK : ACLCHECK_NO_PRIV);
+					return (aip->ai_mode & mode) ? ACLCHECK_OK : ACLCHECK_NO_PRIV;
 				}
 			}
 			break;
@@ -354,7 +354,7 @@ aclcheck(char *relname, Acl *acl, AclId id, AclIdType idtype, AclMode mode)
 #ifdef ACLDEBUG_TRACE
 	elog(DEBUG, "aclcheck: using world=%d", aidat->ai_mode);
 #endif
-	return ((aidat->ai_mode & mode) ? ACLCHECK_OK : ACLCHECK_NO_PRIV);
+	return (aidat->ai_mode & mode) ? ACLCHECK_OK : ACLCHECK_NO_PRIV;
 }
 
 int32
@@ -433,7 +433,7 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
 		relation = heap_openr(RelationRelationName);
 		tmp = (Acl *) heap_getattr(tuple,
 								   Anum_pg_class_relacl,
-								   RelationGetTupleDescriptor(relation),
+								   RelationGetDescr(relation),
 								   (bool *) NULL);
 		acl = makeacl(ACL_NUM(tmp));
 		memmove((char *) acl, (char *) tmp, ACL_SIZE(tmp));
@@ -451,7 +451,7 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
 		relation = heap_openr(RelationRelationName);
 		ownerId = (int4) heap_getattr(tuple,
 									 Anum_pg_class_relowner,
-									 RelationGetTupleDescriptor(relation),
+									 RelationGetDescr(relation),
 									 (bool *) NULL);
 		acl = aclownerdefault(relname, (AclId)ownerId);
 	}
@@ -476,7 +476,7 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
 		{
 			tmp = (Acl *) heap_getattr(tuple,
 									   Anum_pg_class_relacl,
-										RelationGetTupleDescriptor(relation),
+										RelationGetDescr(relation),
 									   (bool *) NULL);
 			acl = makeacl(ACL_NUM(tmp));
 			memmove((char *) acl, (char *) tmp, ACL_SIZE(tmp));
@@ -487,7 +487,7 @@ pg_aclcheck(char *relname, char *usename, AclMode mode)
 	result = aclcheck(relname, acl, id, (AclIdType) ACL_IDTYPE_UID, mode);
 	if (acl)
 		pfree(acl);
-	return (result);
+	return result;
 }
 
 int32
@@ -516,7 +516,7 @@ pg_ownercheck(char *usename,
 		elog(DEBUG, "pg_ownercheck: user \"%s\" is superuser",
 			 usename);
 #endif
-		return (1);
+		return 1;
 	}
 
 	tuple = SearchSysCacheTuple(cacheid, PointerGetDatum(value),
@@ -527,7 +527,7 @@ pg_ownercheck(char *usename,
 			if (!HeapTupleIsValid(tuple))
 				elog(ERROR, "pg_ownercheck: operator %ld not found",
 					 PointerGetDatum(value));
-			owner_id = ((OperatorTupleForm) GETSTRUCT(tuple))->oprowner;
+			owner_id = ((Form_pg_operator) GETSTRUCT(tuple))->oprowner;
 			break;
 		case PRONAME:
 			if (!HeapTupleIsValid(tuple))
@@ -545,7 +545,7 @@ pg_ownercheck(char *usename,
 			if (!HeapTupleIsValid(tuple))
 				elog(ERROR, "pg_ownercheck: type \"%s\" not found",
 					 value);
-			owner_id = ((TypeTupleForm) GETSTRUCT(tuple))->typowner;
+			owner_id = ((Form_pg_type) GETSTRUCT(tuple))->typowner;
 			break;
 		default:
 			elog(ERROR, "pg_ownercheck: invalid cache id: %d",
@@ -553,7 +553,7 @@ pg_ownercheck(char *usename,
 			break;
 	}
 
-	return (user_id == owner_id);
+	return user_id == owner_id;
 }
 
 int32
@@ -583,7 +583,7 @@ pg_func_ownercheck(char *usename,
 		elog(DEBUG, "pg_ownercheck: user \"%s\" is superuser",
 			 usename);
 #endif
-		return (1);
+		return 1;
 	}
 
 	tuple = SearchSysCacheTuple(PRONAME,
@@ -596,7 +596,7 @@ pg_func_ownercheck(char *usename,
 
 	owner_id = ((Form_pg_proc) GETSTRUCT(tuple))->proowner;
 
-	return (user_id == owner_id);
+	return user_id == owner_id;
 }
 
 int32
@@ -625,7 +625,7 @@ pg_aggr_ownercheck(char *usename,
 		elog(DEBUG, "pg_aggr_ownercheck: user \"%s\" is superuser",
 			 usename);
 #endif
-		return (1);
+		return 1;
 	}
 
 	tuple = SearchSysCacheTuple(AGGNAME,
@@ -638,5 +638,5 @@ pg_aggr_ownercheck(char *usename,
 
 	owner_id = ((Form_pg_aggregate) GETSTRUCT(tuple))->aggowner;
 
-	return (user_id == owner_id);
+	return user_id == owner_id;
 }

src/backend/catalog/catalog.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.16 1998/08/19 02:01:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.17 1998/09/01 03:21:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@
  *		Perhaps this should be in-line code in relopen().
  */
 char *
-relpath(char relname[])
+relpath(char *relname)
 {
 	char	   *path;
 
@@ -35,9 +35,9 @@ relpath(char relname[])
 	{
 		path = (char *) palloc(strlen(DataDir) + sizeof(NameData) + 2);
 		sprintf(path, "%s/%s", DataDir, relname);
-		return (path);
+		return path;
 	}
-	return (relname);
+	return relname;
 }
 
 #ifdef NOT_USED
@@ -51,7 +51,7 @@ relpath(char relname[])
  *		XXX this is way bogus. -- pma
  */
 bool
-issystem(char relname[])
+issystem(char *relname)
 {
 	if (relname[0] && relname[1] && relname[2])
 		return (relname[0] == 'p' &&
@@ -154,12 +154,12 @@ newoid()
 void
 fillatt(TupleDesc tupleDesc)
 {
-	AttributeTupleForm *attributeP;
-	TypeTupleForm typp;
+	Form_pg_attribute *attributeP;
+	Form_pg_type typp;
 	HeapTuple	tuple;
 	int			i;
 	int			natts = tupleDesc->natts;
-	AttributeTupleForm *att = tupleDesc->attrs;
+	Form_pg_attribute *att = tupleDesc->attrs;
 
 	if (natts < 0 || natts > MaxHeapAttributeNumber)
 		elog(ERROR, "fillatt: %d attributes is too large", natts);
@@ -193,7 +193,7 @@ fillatt(TupleDesc tupleDesc)
 			 */
 			if (!(*attributeP)->attisset)
 			{
-				typp = (TypeTupleForm) GETSTRUCT(tuple);		/* XXX */
+				typp = (Form_pg_type) GETSTRUCT(tuple);		/* XXX */
 				(*attributeP)->attlen = typp->typlen;
 				(*attributeP)->attbyval = typp->typbyval;
 			}

src/backend/catalog/heap.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.62 1998/08/29 04:19:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.63 1998/09/01 03:21:41 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		heap_create()			- Create an uncataloged heap relation
@@ -73,7 +73,7 @@ static void AddToTempRelList(Relation r);
 static void DeletePgAttributeTuples(Relation rel);
 static void DeletePgRelationTuple(Relation rel);
 static void DeletePgTypeTuple(Relation rel);
-static int	RelationAlreadyExists(Relation pg_class_desc, char relname[]);
+static int	RelationAlreadyExists(Relation pg_class_desc, char *relname);
 static void RelationRemoveIndexes(Relation relation);
 static void RelationRemoveInheritance(Relation relation);
 static void RemoveFromTempRelList(Relation r);
@@ -129,7 +129,7 @@ static FormData_pg_attribute a6 = {
 	MaxCommandIdAttributeNumber, 0, -1, -1, '\001', '\0', 'i', '\0', '\0'
 };
 
-static AttributeTupleForm HeapAtt[] =
+static Form_pg_attribute HeapAtt[] =
 {&a1, &a2, &a3, &a4, &a5, &a6};
 
 /* ----------------------------------------------------------------
@@ -185,7 +185,7 @@ heap_create(char *name,
 	int			isTemp = 0;
 	int			natts = tupDesc->natts;
 
-/*	  AttributeTupleForm *att = tupDesc->attrs; */
+/*	  Form_pg_attribute *att = tupDesc->attrs; */
 
 	extern GlobalMemory CacheCxt;
 	MemoryContext oldcxt;
@@ -332,7 +332,7 @@ heap_create(char *name,
 	if (isTemp)
 		AddToTempRelList(rel);
 
-	return (rel);
+	return rel;
 }
 
 
@@ -465,7 +465,7 @@ CheckAttributeNames(TupleDesc tupdesc)
  * --------------------------------
  */
 static int
-RelationAlreadyExists(Relation pg_class_desc, char relname[])
+RelationAlreadyExists(Relation pg_class_desc, char *relname)
 {
 	ScanKeyData key;
 	HeapScanDesc pg_class_scan;
@@ -535,7 +535,7 @@ static void
 AddNewAttributeTuples(Oid new_rel_oid,
 					  TupleDesc tupdesc)
 {
-	AttributeTupleForm *dpp;
+	Form_pg_attribute *dpp;
 	unsigned	i;
 	HeapTuple	tup;
 	Relation	rel;
@@ -555,7 +555,7 @@ AddNewAttributeTuples(Oid new_rel_oid,
 	 */
 	Assert(rel);
 	Assert(rel->rd_rel);
-	hasindex = RelationGetRelationTupleForm(rel)->relhasindex;
+	hasindex = RelationGetForm(rel)->relhasindex;
 	if (hasindex)
 		CatalogOpenIndices(Num_pg_attr_indices, Name_pg_attr_indices, idescs);
 
@@ -911,7 +911,7 @@ RelationRemoveInheritance(Relation relation)
 		heap_close(catalogRelation);
 
 		elog(ERROR, "relation <%d> inherits \"%s\"",
-			 ((InheritsTupleForm) GETSTRUCT(tuple))->inhrel,
+			 ((Form_pg_inherits) GETSTRUCT(tuple))->inhrel,
 			 RelationGetRelationName(relation));
 	}
 
@@ -984,7 +984,7 @@ RelationRemoveIndexes(Relation relation)
 						  &entry);
 
 	while (HeapTupleIsValid(tuple = heap_getnext(scan, 0)))
-		index_destroy(((IndexTupleForm) GETSTRUCT(tuple))->indexrelid);
+		index_destroy(((Form_pg_index) GETSTRUCT(tuple))->indexrelid);
 
 	heap_endscan(scan);
 	heap_close(indexRelation);
@@ -1165,7 +1165,7 @@ DeletePgTypeTuple(Relation rel)
 
 	if (HeapTupleIsValid(atttup))
 	{
-		Oid			relid = ((AttributeTupleForm) GETSTRUCT(atttup))->attrelid;
+		Oid			relid = ((Form_pg_attribute) GETSTRUCT(atttup))->attrelid;
 
 		heap_endscan(pg_type_scan);
 		heap_close(pg_type_desc);
@@ -1428,7 +1428,7 @@ StoreAttrDefault(Relation rel, AttrDefault *attrdef)
 {
 	char		str[MAX_PARSE_BUFFER];
 	char		cast[2 * NAMEDATALEN] = {0};
-	AttributeTupleForm atp = rel->rd_att->attrs[attrdef->adnum - 1];
+	Form_pg_attribute atp = rel->rd_att->attrs[attrdef->adnum - 1];
 	QueryTreeList *queryTree_list;
 	Query	   *query;
 	List	   *planTree_list;

src/backend/catalog/indexing.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.24 1998/08/31 17:49:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.25 1998/09/01 03:21:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,7 +74,7 @@ static HeapTuple CatalogIndexFetchTuple(Relation heapRelation,
  * associated with them.
  */
 void
-CatalogOpenIndices(int nIndices, char *names[], Relation idescs[])
+CatalogOpenIndices(int nIndices, char **names, Relation *idescs)
 {
 	int			i;
 
@@ -108,7 +108,7 @@ CatalogIndexInsert(Relation *idescs,
 {
 	HeapTuple	pgIndexTup;
 	TupleDesc	heapDescriptor;
-	IndexTupleForm pgIndexP;
+	Form_pg_index pgIndexP;
 	Datum		datum;
 	int			natts;
 	AttrNumber *attnumP;
@@ -117,19 +117,19 @@ CatalogIndexInsert(Relation *idescs,
 	char		nulls[INDEX_MAX_KEYS];
 	int			i;
 
-	heapDescriptor = RelationGetTupleDescriptor(heapRelation);
+	heapDescriptor = RelationGetDescr(heapRelation);
 
 	for (i = 0; i < nIndices; i++)
 	{
 		TupleDesc	indexDescriptor;
 		InsertIndexResult indexRes;
 
-		indexDescriptor = RelationGetTupleDescriptor(idescs[i]);
+		indexDescriptor = RelationGetDescr(idescs[i]);
 		pgIndexTup = SearchSysCacheTupleCopy(INDEXRELID,
 										 ObjectIdGetDatum(idescs[i]->rd_id),
 										 0, 0, 0);
 		Assert(pgIndexTup);
-		pgIndexP = (IndexTupleForm) GETSTRUCT(pgIndexTup);
+		pgIndexP = (Form_pg_index) GETSTRUCT(pgIndexTup);
 
 		/*
 		 * Compute the number of attributes we are indexing upon.
@@ -191,9 +191,9 @@ CatalogHasIndex(char *catName, Oid catId)
 		for (i = 0; IndexedCatalogNames[i] != NULL; i++)
 		{
 			if (strcmp(IndexedCatalogNames[i], catName) == 0)
-				return (true);
+				return true;
 		}
-		return (false);
+		return false;
 	}
 
 	pg_class = heap_openr(RelationRelationName);
@@ -207,7 +207,7 @@ CatalogHasIndex(char *catName, Oid catId)
 	}
 
 	pgRelP = (Form_pg_class) GETSTRUCT(htup);
-	return (pgRelP->relhasindex);
+	return pgRelP->relhasindex;
 }
 
 /*

src/backend/catalog/pg_aggregate.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.15 1998/08/19 02:01:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.16 1998/09/01 03:21:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -314,14 +314,14 @@ AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool *isNull)
 	 * NULL
 	 */
 	textInitVal = (text *) fastgetattr(tup, initValAttno,
-									   RelationGetTupleDescriptor(aggRel),
+									   RelationGetDescr(aggRel),
 									   isNull);
 	if (!PointerIsValid(textInitVal))
 		*isNull = true;
 	if (*isNull)
 	{
 		heap_close(aggRel);
-		return ((char *) NULL);
+		return (char *) NULL;
 	}
 	strInitVal = textout(textInitVal);
 	heap_close(aggRel);
@@ -334,7 +334,7 @@ AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool *isNull)
 		pfree(strInitVal);
 		elog(ERROR, "AggNameGetInitVal: cache lookup failed on aggregate transition function return type");
 	}
-	initVal = fmgr(((TypeTupleForm) GETSTRUCT(tup))->typinput, strInitVal, -1);
+	initVal = fmgr(((Form_pg_type) GETSTRUCT(tup))->typinput, strInitVal, -1);
 	pfree(strInitVal);
-	return (initVal);
+	return initVal;
 }

src/backend/catalog/pg_operator.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.27 1998/08/19 02:01:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.28 1998/09/01 03:21:47 momjian Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -234,7 +234,7 @@ OperatorShellMakeWithOpenRelation(Relation pg_operator_desc,
 	TupleDesc	tupDesc;
 
 	/* ----------------
-	 *	initialize our nulls[] and values[] arrays
+	 *	initialize our *nulls and *values arrays
 	 * ----------------
 	 */
 	for (i = 0; i < Natts_pg_operator; ++i)
@@ -244,7 +244,7 @@ OperatorShellMakeWithOpenRelation(Relation pg_operator_desc,
 	}
 
 	/* ----------------
-	 *	initialize values[] with the type name and
+	 *	initialize *values with the type name and
 	 * ----------------
 	 */
 	i = 0;
@@ -807,9 +807,9 @@ OperatorUpd(Oid baseId, Oid commId, Oid negId)
 	{
 		if (HeapTupleIsValid(tup))
 		{
-			OperatorTupleForm t;
+			Form_pg_operator t;
 
-			t = (OperatorTupleForm) GETSTRUCT(tup);
+			t = (Form_pg_operator) GETSTRUCT(tup);
 			if (!OidIsValid(t->oprcom)
 				|| !OidIsValid(t->oprnegate))
 			{
@@ -849,7 +849,7 @@ OperatorUpd(Oid baseId, Oid commId, Oid negId)
 
 	/* if commutator and negator are different, do two updates */
 	if (HeapTupleIsValid(tup) &&
-		!(OidIsValid(((OperatorTupleForm) GETSTRUCT(tup))->oprcom)))
+		!(OidIsValid(((Form_pg_operator) GETSTRUCT(tup))->oprcom)))
 	{
 		values[Anum_pg_operator_oprcom - 1] = ObjectIdGetDatum(baseId);
 		replaces[Anum_pg_operator_oprcom - 1] = 'r';
@@ -878,7 +878,7 @@ OperatorUpd(Oid baseId, Oid commId, Oid negId)
 
 	tup = heap_getnext(pg_operator_scan, 0);
 	if (HeapTupleIsValid(tup) &&
-		!(OidIsValid(((OperatorTupleForm) GETSTRUCT(tup))->oprnegate)))
+		!(OidIsValid(((Form_pg_operator) GETSTRUCT(tup))->oprnegate)))
 	{
 		values[Anum_pg_operator_oprnegate - 1] = ObjectIdGetDatum(baseId);
 		replaces[Anum_pg_operator_oprnegate - 1] = 'r';

src/backend/catalog/pg_proc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.21 1998/08/31 17:49:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.22 1998/09/01 03:21:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -266,7 +266,7 @@ ProcedureCreate(char *procedureName,
 
 	heap_insert(rel, tup);
 
-	if (RelationGetRelationTupleForm(rel)->relhasindex)
+	if (RelationGetForm(rel)->relhasindex)
 	{
 		Relation	idescs[Num_pg_proc_indices];
 

src/backend/catalog/pg_type.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.28 1998/08/20 22:07:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.29 1998/09/01 03:21:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -98,7 +98,7 @@ TypeGetWithOpenRelation(Relation pg_type_desc,
 	 * ----------------
 	 */
 	heap_endscan(scan);
-	*defined = (bool) ((TypeTupleForm) GETSTRUCT(tup))->typisdefined;
+	*defined = (bool) ((Form_pg_type) GETSTRUCT(tup))->typisdefined;
 
 	return tup->t_oid;
 }
@@ -163,7 +163,7 @@ TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName)
 	TupleDesc	tupDesc;
 
 	/* ----------------
-	 *	initialize our nulls[] and values[] arrays
+	 *	initialize our *nulls and *values arrays
 	 * ----------------
 	 */
 	for (i = 0; i < Natts_pg_type; ++i)
@@ -173,7 +173,7 @@ TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName)
 	}
 
 	/* ----------------
-	 *	initialize values[] with the type name and
+	 *	initialize *values with the type name and
 	 * ----------------
 	 */
 	i = 0;
@@ -215,7 +215,7 @@ TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName)
 	heap_insert(pg_type_desc, tup);
 	typoid = tup->t_oid;
 
-	if (RelationGetRelationTupleForm(pg_type_desc)->relhasindex)
+	if (RelationGetForm(pg_type_desc)->relhasindex)
 	{
 		Relation	idescs[Num_pg_type_indices];
 
@@ -375,7 +375,7 @@ TypeCreate(char *typeName,
 		internalSize = -1;
 
 	/* ----------------
-	 *	initialize the values[] information
+	 *	initialize the *values information
 	 * ----------------
 	 */
 	i = 0;
@@ -509,7 +509,7 @@ TypeCreate(char *typeName,
 	 */
 	heap_endscan(pg_type_scan);
 
-	if (RelationGetRelationTupleForm(pg_type_desc)->relhasindex)
+	if (RelationGetForm(pg_type_desc)->relhasindex)
 	{
 		Relation	idescs[Num_pg_type_indices];
 
@@ -558,7 +558,7 @@ TypeRename(char *oldTypeName, char *newTypeName)
 		elog(ERROR, "TypeRename: type %s already defined", newTypeName);
 	}
 	
-	namestrcpy(&(((TypeTupleForm) GETSTRUCT(oldtup))->typname), newTypeName);
+	namestrcpy(&(((Form_pg_type) GETSTRUCT(oldtup))->typname), newTypeName);
 
 	setheapoverride(true);
 	heap_replace(pg_type_desc, &oldtup->t_ctid, oldtup);

src/backend/commands/async.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.38 1998/08/30 21:04:43 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.39 1998/09/01 03:21:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -189,7 +189,7 @@ Async_Notify(char *relname)
 						   PointerGetDatum(notifyName));
 
 	lRel = heap_openr(ListenerRelationName);
-	tdesc = RelationGetTupleDescriptor(lRel);
+	tdesc = RelationGetDescr(lRel);
 	RelationSetLockForWrite(lRel);
 	sRel = heap_beginscan(lRel, 0, SnapshotNow, 1, &key);
 
@@ -281,7 +281,7 @@ Async_NotifyAtCommit()
 			lRel = heap_openr(ListenerRelationName);
 			RelationSetLockForWrite(lRel);
 			sRel = heap_beginscan(lRel, 0, SnapshotNow, 1, &key);
-			tdesc = RelationGetTupleDescriptor(lRel);
+			tdesc = RelationGetDescr(lRel);
 
 			while (HeapTupleIsValid(lTuple = heap_getnext(sRel, 0)))
 			{
@@ -445,7 +445,7 @@ Async_Listen(char *relname, int pid)
 	RelationSetLockForWrite(lDesc);
 
 	/* is someone already listening.  One listener per relation */
-	tdesc = RelationGetTupleDescriptor(lDesc);
+	tdesc = RelationGetDescr(lDesc);
 	scan = heap_beginscan(lDesc, 0, SnapshotNow, 0, (ScanKey) NULL);
 	while (HeapTupleIsValid(tuple = heap_getnext(scan, 0)))
 	{
@@ -571,7 +571,7 @@ Async_UnlistenAll()
 						   Int32GetDatum(MyProcPid));
 	lRel = heap_openr(ListenerRelationName);
 	RelationSetLockForWrite(lRel);
-	tdesc = RelationGetTupleDescriptor(lRel);
+	tdesc = RelationGetDescr(lRel);
 	sRel = heap_beginscan(lRel, 0, SnapshotNow, 1, key);
 
 	while (HeapTupleIsValid(lTuple = heap_getnext(sRel, 0)))
@@ -672,7 +672,7 @@ Async_NotifyFrontEnd_Aux()
 						   Int32GetDatum(MyProcPid));
 	lRel = heap_openr(ListenerRelationName);
 	RelationSetLockForWrite(lRel);
-	tdesc = RelationGetTupleDescriptor(lRel);
+	tdesc = RelationGetDescr(lRel);
 	sRel = heap_beginscan(lRel, 0, SnapshotNow, 2, key);
 
 	nulls[0] = nulls[1] = nulls[2] = ' ';

src/backend/commands/cluster.c

@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.29 1998/08/20 22:24:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.30 1998/09/01 03:21:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -80,7 +80,7 @@ static void rebuildheap(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex);
  *
  */
 void
-cluster(char oldrelname[], char oldindexname[])
+cluster(char *oldrelname, char *oldindexname)
 {
 	Oid			OIDOldHeap,
 				OIDOldIndex,
@@ -209,7 +209,7 @@ copy_heap(Oid OIDOldHeap)
 	sprintf(NewName, "temp_%x", OIDOldHeap);
 
 	OldHeap = heap_open(OIDOldHeap);
-	OldHeapDesc = RelationGetTupleDescriptor(OldHeap);
+	OldHeapDesc = RelationGetDescr(OldHeap);
 
 	/*
 	 * Need to make a copy of the tuple descriptor,
@@ -239,7 +239,7 @@ copy_index(Oid OIDOldIndex, Oid OIDNewHeap)
 	HeapTuple	Old_pg_index_Tuple,
 				Old_pg_index_relation_Tuple,
 				pg_proc_Tuple;
-	IndexTupleForm Old_pg_index_Form;
+	Form_pg_index Old_pg_index_Form;
 	Form_pg_class Old_pg_index_relation_Form;
 	Form_pg_proc pg_proc_Form;
 	char	   *NewIndexName;
@@ -261,7 +261,7 @@ copy_index(Oid OIDOldIndex, Oid OIDNewHeap)
 							0, 0, 0);
 
 	Assert(Old_pg_index_Tuple);
-	Old_pg_index_Form = (IndexTupleForm) GETSTRUCT(Old_pg_index_Tuple);
+	Old_pg_index_Form = (Form_pg_index) GETSTRUCT(Old_pg_index_Tuple);
 
 	Old_pg_index_relation_Tuple =
 		SearchSysCacheTuple(RELOID,

src/backend/commands/command.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.30 1998/08/19 02:01:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.31 1998/09/01 03:21:53 momjian Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -270,11 +270,11 @@ PerformAddAttribute(char *relationName,
 					bool inherits,
 					ColumnDef *colDef)
 {
-	Relation	relrdesc,
+	Relation	rel,
 				attrdesc;
 	HeapTuple	reltup;
 	HeapTuple	attributeTuple;
-	AttributeTupleForm attribute;
+	Form_pg_attribute attribute;
 	FormData_pg_attribute attributeD;
 	int			i;
 	int			minattnum,
@@ -325,14 +325,14 @@ PerformAddAttribute(char *relationName,
 			List	   *child,
 					   *children;
 
-			relrdesc = heap_openr(relationName);
-			if (!RelationIsValid(relrdesc))
+			rel = heap_openr(relationName);
+			if (!RelationIsValid(rel))
 			{
 				elog(ERROR, "PerformAddAttribute: unknown relation: \"%s\"",
 					 relationName);
 			}
-			myrelid = RelationGetRelid(relrdesc);
-			heap_close(relrdesc);
+			myrelid = RelationGetRelid(rel);
+			heap_close(rel);
 
 			/* this routine is actually in the planner */
 			children = find_all_inheritors(lconsi(myrelid, NIL), NIL);
@@ -347,20 +347,20 @@ PerformAddAttribute(char *relationName,
 				childrelid = lfirsti(child);
 				if (childrelid == myrelid)
 					continue;
-				relrdesc = heap_open(childrelid);
-				if (!RelationIsValid(relrdesc))
+				rel = heap_open(childrelid);
+				if (!RelationIsValid(rel))
 				{
 					elog(ERROR, "PerformAddAttribute: can't find catalog entry for inheriting class with oid %d",
 						 childrelid);
 				}
-				PerformAddAttribute((relrdesc->rd_rel->relname).data,
+				PerformAddAttribute((rel->rd_rel->relname).data,
 									userName, false, colDef);
-				heap_close(relrdesc);
+				heap_close(rel);
 			}
 		}
 	}
 
-	relrdesc = heap_openr(RelationRelationName);
+	rel = heap_openr(RelationRelationName);
 
 	reltup = SearchSysCacheTupleCopy(RELNAME,
 									 PointerGetDatum(relationName),
@@ -368,7 +368,7 @@ PerformAddAttribute(char *relationName,
 
 	if (!HeapTupleIsValid(reltup))
 	{
-		heap_close(relrdesc);
+		heap_close(rel);
 		elog(ERROR, "PerformAddAttribute: relation \"%s\" not found",
 			 relationName);
 	}
@@ -388,7 +388,7 @@ PerformAddAttribute(char *relationName,
 	if (maxatts > MaxHeapAttributeNumber)
 	{
 		pfree(reltup);
-		heap_close(relrdesc);
+		heap_close(rel);
 		elog(ERROR, "PerformAddAttribute: relations limited to %d attributes",
 			 MaxHeapAttributeNumber);
 	}
@@ -396,12 +396,12 @@ PerformAddAttribute(char *relationName,
 	attrdesc = heap_openr(AttributeRelationName);
 
 	Assert(attrdesc);
-	Assert(RelationGetRelationTupleForm(attrdesc));
+	Assert(RelationGetForm(attrdesc));
 
 	/*
 	 * Open all (if any) pg_attribute indices
 	 */
-	hasindex = RelationGetRelationTupleForm(attrdesc)->relhasindex;
+	hasindex = RelationGetForm(attrdesc)->relhasindex;
 	if (hasindex)
 		CatalogOpenIndices(Num_pg_attr_indices, Name_pg_attr_indices, idescs);
 
@@ -411,13 +411,13 @@ PerformAddAttribute(char *relationName,
 									sizeof attributeD,
 									(char *) &attributeD);
 
-	attribute = (AttributeTupleForm) GETSTRUCT(attributeTuple);
+	attribute = (Form_pg_attribute) GETSTRUCT(attributeTuple);
 
 	i = 1 + minattnum;
 
 	{
 		HeapTuple	typeTuple;
-		TypeTupleForm form;
+		Form_pg_type form;
 		char	   *typename;
 		int			attnelems;
 
@@ -429,7 +429,7 @@ PerformAddAttribute(char *relationName,
 		if (HeapTupleIsValid(tup))
 		{
 			heap_close(attrdesc);
-			heap_close(relrdesc);
+			heap_close(rel);
 			elog(ERROR, "PerformAddAttribute: attribute \"%s\" already exists in class \"%s\"",
 				colDef->colname, relationName);
 		}
@@ -451,7 +451,7 @@ PerformAddAttribute(char *relationName,
 		typeTuple = SearchSysCacheTuple(TYPNAME,
 										PointerGetDatum(typename),
 										0, 0, 0);
-		form = (TypeTupleForm) GETSTRUCT(typeTuple);
+		form = (Form_pg_type) GETSTRUCT(typeTuple);
 
 		if (!HeapTupleIsValid(typeTuple))
 			elog(ERROR, "Add: type \"%s\" nonexistent", typename);
@@ -482,13 +482,13 @@ PerformAddAttribute(char *relationName,
 	heap_close(attrdesc);
 
 	((Form_pg_class) GETSTRUCT(reltup))->relnatts = maxatts;
-	heap_replace(relrdesc, &reltup->t_ctid, reltup);
+	heap_replace(rel, &reltup->t_ctid, reltup);
 
 	/* keep catalog indices current */
 	CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, ridescs);
-	CatalogIndexInsert(ridescs, Num_pg_class_indices, relrdesc, reltup);
+	CatalogIndexInsert(ridescs, Num_pg_class_indices, rel, reltup);
 	CatalogCloseIndices(Num_pg_class_indices, ridescs);
 
 	pfree(reltup);
-	heap_close(relrdesc);
+	heap_close(rel);
 }

src/backend/commands/copy.c

@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.57 1998/08/29 18:19:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.58 1998/09/01 03:21:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -217,7 +217,7 @@ CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
 
 	int32		attr_count,
 				i;
-	AttributeTupleForm *attr;
+	Form_pg_attribute *attr;
 	FmgrInfo   *out_functions;
 	Oid			out_func_oid;
 	Oid		   *elements;
@@ -371,7 +371,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
 {
 	HeapTuple	tuple;
 	AttrNumber	attr_count;
-	AttributeTupleForm *attr;
+	Form_pg_attribute *attr;
 	FmgrInfo   *in_functions;
 	int			i;
 	Oid			in_func_oid;
@@ -397,7 +397,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
 			  **finfoP = NULL;
 	TupleDesc  *itupdescArr;
 	HeapTuple	pgIndexTup;
-	IndexTupleForm *pgIndexP = NULL;
+	Form_pg_index *pgIndexP = NULL;
 	int		   *indexNatts = NULL;
 	char	   *predString;
 	Node	  **indexPred = NULL;
@@ -418,7 +418,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
 	Oid			loaded_oid;
 	bool		skip_tuple = false;
 
-	tupDesc = RelationGetTupleDescriptor(rel);
+	tupDesc = RelationGetDescr(rel);
 	attr = tupDesc->attrs;
 	attr_count = tupDesc->natts;
 
@@ -438,7 +438,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
 			itupdescArr =
 				(TupleDesc *) palloc(n_indices * sizeof(TupleDesc));
 			pgIndexP =
-				(IndexTupleForm *) palloc(n_indices * sizeof(IndexTupleForm));
+				(Form_pg_index *) palloc(n_indices * sizeof(Form_pg_index));
 			indexNatts = (int *) palloc(n_indices * sizeof(int));
 			finfo = (FuncIndexInfo *) palloc(n_indices * sizeof(FuncIndexInfo));
 			finfoP = (FuncIndexInfo **) palloc(n_indices * sizeof(FuncIndexInfo *));
@@ -446,13 +446,13 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
 			econtext = NULL;
 			for (i = 0; i < n_indices; i++)
 			{
-				itupdescArr[i] = RelationGetTupleDescriptor(index_rels[i]);
+				itupdescArr[i] = RelationGetDescr(index_rels[i]);
 				pgIndexTup =
 					SearchSysCacheTuple(INDEXRELID,
 								  ObjectIdGetDatum(RelationGetRelid(index_rels[i])),
 										0, 0, 0);
 				Assert(pgIndexTup);
-				pgIndexP[i] = (IndexTupleForm) GETSTRUCT(pgIndexTup);
+				pgIndexP[i] = (Form_pg_index) GETSTRUCT(pgIndexTup);
 				for (attnumP = &(pgIndexP[i]->indkey[0]), natts = 0;
 					 *attnumP != InvalidAttrNumber;
 					 attnumP++, natts++);
@@ -480,7 +480,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
 						slot = ExecAllocTableSlot(tupleTable);
 						econtext = makeNode(ExprContext);
 						econtext->ecxt_scantuple = slot;
-						rtupdesc = RelationGetTupleDescriptor(rel);
+						rtupdesc = RelationGetDescr(rel);
 						slot->ttc_tupleDescriptor = rtupdesc;
 
 						/*
@@ -831,10 +831,10 @@ GetOutputFunction(Oid type)
 									0, 0, 0);
 
 	if (HeapTupleIsValid(typeTuple))
-		return ((int) ((TypeTupleForm) GETSTRUCT(typeTuple))->typoutput);
+		return (int) ((Form_pg_type) GETSTRUCT(typeTuple))->typoutput;
 
 	elog(ERROR, "GetOutputFunction: Cache lookup of type %d failed", type);
-	return (InvalidOid);
+	return InvalidOid;
 }
 
 static Oid
@@ -847,10 +847,10 @@ GetTypeElement(Oid type)
 									0, 0, 0);
 
 	if (HeapTupleIsValid(typeTuple))
-		return ((int) ((TypeTupleForm) GETSTRUCT(typeTuple))->typelem);
+		return (int) ((Form_pg_type) GETSTRUCT(typeTuple))->typelem;
 
 	elog(ERROR, "GetOutputFunction: Cache lookup of type %d failed", type);
-	return (InvalidOid);
+	return InvalidOid;
 }
 
 static Oid
@@ -863,10 +863,10 @@ GetInputFunction(Oid type)
 									0, 0, 0);
 
 	if (HeapTupleIsValid(typeTuple))
-		return ((int) ((TypeTupleForm) GETSTRUCT(typeTuple))->typinput);
+		return (int) ((Form_pg_type) GETSTRUCT(typeTuple))->typinput;
 
 	elog(ERROR, "GetInputFunction: Cache lookup of type %d failed", type);
-	return (InvalidOid);
+	return InvalidOid;
 }
 
 static Oid
@@ -879,11 +879,11 @@ IsTypeByVal(Oid type)
 									0, 0, 0);
 
 	if (HeapTupleIsValid(typeTuple))
-		return ((int) ((TypeTupleForm) GETSTRUCT(typeTuple))->typbyval);
+		return (int) ((Form_pg_type) GETSTRUCT(typeTuple))->typbyval;
 
 	elog(ERROR, "GetInputFunction: Cache lookup of type %d failed", type);
 
-	return (InvalidOid);
+	return InvalidOid;
 }
 
 /*
@@ -917,7 +917,7 @@ GetIndexRelations(Oid main_relation_oid,
 
 	pg_index_rel = heap_openr(IndexRelationName);
 	scandesc = heap_beginscan(pg_index_rel, 0, SnapshotNow, 0, NULL);
-	tupDesc = RelationGetTupleDescriptor(pg_index_rel);
+	tupDesc = RelationGetDescr(pg_index_rel);
 
 	*n_indices = 0;
 
@@ -1039,25 +1039,25 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim)
 	if (*newline)
 	{
 		*isnull = (bool) true;
-		return (NULL);
+		return NULL;
 	}
 #endif
 
 	*isnull = (bool) false;		/* set default */
 	if (feof(fp))
-		return (NULL);
+		return NULL;
 
 	while (!done)
 	{
 		c = getc(fp);
 
 		if (feof(fp))
-			return (NULL);
+			return NULL;
 		else if (c == '\\')
 		{
 			c = getc(fp);
 			if (feof(fp))
-				return (NULL);
+				return NULL;
 			switch (c)
 			{
 				case '0':
@@ -1082,14 +1082,14 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim)
 							else
 							{
 								if (feof(fp))
-									return (NULL);
+									return NULL;
 								ungetc(c, fp);
 							}
 						}
 						else
 						{
 							if (feof(fp))
-								return (NULL);
+								return NULL;
 							ungetc(c, fp);
 						}
 						c = val & 0377;
@@ -1121,7 +1121,7 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim)
 					c = getc(fp);
 					if (c != '\n')
 						elog(ERROR, "CopyReadAttribute - end of record marker corrupted. line: %d", lineno);
-					return (NULL);
+					return NULL;
 					break;
 			}
 		}
@@ -1142,7 +1142,7 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim)
 			for(j=0;j<mblen;j++) {
 			  c = getc(fp);
 			  if (feof(fp))
-			    return (NULL);
+			    return NULL;
 			  attribute[i++] = c;
 			}
 #endif
@@ -1153,7 +1153,7 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim)
 #ifdef MULTIBYTE
 	return(pg_client_to_server((unsigned char*)attribute, strlen(attribute)));
 #else
-	return (&attribute[0]);
+	return &attribute[0];
 #endif
 }
 
@@ -1233,5 +1233,5 @@ CountTuples(Relation relation)
 	while (HeapTupleIsValid(tuple = heap_getnext(scandesc, 0)))
 		i++;
 	heap_endscan(scandesc);
-	return (i);
+	return i;
 }

src/backend/commands/creatinh.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.32 1998/08/19 02:01:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.33 1998/09/01 03:21:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -258,12 +258,12 @@ MergeAttributes(List *schema, List *supers, List **supconstr)
 		}
 		if (relation->rd_rel->relkind == 'S')
 			elog(ERROR, "MergeAttr: Can't inherit from sequence superclass '%s'", name);
-		tupleDesc = RelationGetTupleDescriptor(relation);
+		tupleDesc = RelationGetDescr(relation);
 		constr = tupleDesc->constr;
 
 		for (attrno = relation->rd_rel->relnatts - 1; attrno >= 0; attrno--)
 		{
-			AttributeTupleForm attribute = tupleDesc->attrs[attrno];
+			Form_pg_attribute attribute = tupleDesc->attrs[attrno];
 			char	   *attributeName;
 			char	   *attributeType;
 			HeapTuple	tuple;
@@ -280,7 +280,7 @@ MergeAttributes(List *schema, List *supers, List **supconstr)
 									0, 0, 0);
 			AssertState(HeapTupleIsValid(tuple));
 			attributeType =
-				(((TypeTupleForm) GETSTRUCT(tuple))->typname).data;
+				(((Form_pg_type) GETSTRUCT(tuple))->typname).data;
 
 			/*
 			 * check validity
@@ -363,7 +363,7 @@ MergeAttributes(List *schema, List *supers, List **supconstr)
 	 */
 	schema = nconc(inhSchema, schema);
 	*supconstr = constraints;
-	return (schema);
+	return schema;
 }
 
 /*
@@ -394,7 +394,7 @@ StoreCatalogInheritance(Oid relationId, List *supers)
 	 * ----------------
 	 */
 	relation = heap_openr(InheritsRelationName);
-	desc = RelationGetTupleDescriptor(relation);
+	desc = RelationGetDescr(relation);
 
 	seqNumber = 1;
 	idList = NIL;
@@ -469,7 +469,7 @@ StoreCatalogInheritance(Oid relationId, List *supers)
 				break;
 
 			lnext(current) =
-				lconsi(((InheritsTupleForm)
+				lconsi(((Form_pg_inherits)
 						GETSTRUCT(tuple))->inhparent,
 					   NIL);
 
@@ -519,7 +519,7 @@ again:
 	 * ----------------
 	 */
 	relation = heap_openr(InheritancePrecidenceListRelationName);
-	desc = RelationGetTupleDescriptor(relation);
+	desc = RelationGetDescr(relation);
 
 	seqNumber = 1;
 

src/backend/commands/dbcommands.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.22 1998/08/29 04:09:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.23 1998/09/01 03:21:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -171,7 +171,7 @@ get_pg_dbtup(char *command, char *dbname, Relation dbrel)
 		dbtup = tup;
 
 	heap_endscan(scan);
-	return (dbtup);
+	return dbtup;
 }
 
 /*
@@ -250,12 +250,12 @@ check_permissions(char *command,
 	{
 		dbowner = (int4) heap_getattr(dbtup,
 									 Anum_pg_database_datdba,
-									 RelationGetTupleDescriptor(dbrel),
+									 RelationGetDescr(dbrel),
 									 (char *) NULL);
 		*dbIdP = dbtup->t_oid;
 		dbtext = (text *) heap_getattr(dbtup,
 									   Anum_pg_database_datpath,
-									   RelationGetTupleDescriptor(dbrel),
+									   RelationGetDescr(dbrel),
 									   (char *) NULL);
 
 		strncpy(path, VARDATA(dbtext), (VARSIZE(dbtext) - VARHDRSZ));

src/backend/commands/defind.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.24 1998/08/26 16:43:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.25 1998/09/01 03:21:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -234,7 +234,7 @@ ExtendIndex(char *indexRelationName, Expr *predicate, List *rangetable)
 	HeapTuple	tuple;
 	FuncIndexInfo fInfo;
 	FuncIndexInfo *funcInfo = NULL;
-	IndexTupleForm index;
+	Form_pg_index index;
 	Node	   *oldPred = NULL;
 	List	   *cnfPred = NULL;
 	PredInfo   *predInfo;
@@ -271,7 +271,7 @@ ExtendIndex(char *indexRelationName, Expr *predicate, List *rangetable)
 	/*
 	 * Extract info from the pg_index tuple
 	 */
-	index = (IndexTupleForm) GETSTRUCT(tuple);
+	index = (Form_pg_index) GETSTRUCT(tuple);
 	Assert(index->indexrelid == indexId);
 	relationId = index->indrelid;
 	indproc = index->indproc;
@@ -421,7 +421,7 @@ FuncIndexArgs(IndexElem *funcIndex,
 {
 	List	   *rest;
 	HeapTuple	tuple;
-	AttributeTupleForm att;
+	Form_pg_attribute att;
 
 	tuple = SearchSysCacheTuple(CLANAME,
 								PointerGetDatum(funcIndex->class),
@@ -455,7 +455,7 @@ FuncIndexArgs(IndexElem *funcIndex,
 				 "DefineIndex: attribute \"%s\" not found",
 				 arg);
 		}
-		att = (AttributeTupleForm) GETSTRUCT(tuple);
+		att = (Form_pg_attribute) GETSTRUCT(tuple);
 		*attNumP++ = att->attnum;
 		*argTypes++ = att->atttypid;
 	}
@@ -477,7 +477,7 @@ NormIndexAttrs(List *attList,	/* list of IndexElem's */
 	for (rest = attList; rest != NIL; rest = lnext(rest))
 	{
 		IndexElem  *attribute;
-		AttributeTupleForm attform;
+		Form_pg_attribute attform;
 
 		attribute = lfirst(rest);
 
@@ -495,7 +495,7 @@ NormIndexAttrs(List *attList,	/* list of IndexElem's */
 				 attribute->name);
 		}
 
-		attform = (AttributeTupleForm) GETSTRUCT(atttuple);
+		attform = (Form_pg_attribute) GETSTRUCT(atttuple);
 		*attNumP++ = attform->attnum;
 
 		/* we want the type so we can set the proper alignment, etc. */
@@ -509,7 +509,7 @@ NormIndexAttrs(List *attList,	/* list of IndexElem's */
 					 attribute->name);
 			/* we just set the type name because that is all we need */
 			attribute->typename = makeNode(TypeName);
-			attribute->typename->name = nameout(&((TypeTupleForm) GETSTRUCT(tuple))->typname);
+			attribute->typename->name = nameout(&((Form_pg_type) GETSTRUCT(tuple))->typname);
 		}
 
 		if (attribute->class == NULL)

src/backend/commands/define.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.25 1998/06/15 19:28:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.26 1998/09/01 03:22:00 momjian Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -182,7 +182,7 @@ compute_full_attributes(const List *parameters, int32 *byte_pct_p,
 
 
 static void
-interpret_AS_clause(const char languageName[], const char as[],
+interpret_AS_clause(const char *languageName, const char *as,
 					char **prosrc_str_p, char **probin_str_p)
 {
 
@@ -710,14 +710,14 @@ defGetString(DefElem *def)
 {
 	if (nodeTag(def->arg) != T_String)
 		elog(ERROR, "Define: \"%s\" = what?", def->defname);
-	return (strVal(def->arg));
+	return strVal(def->arg);
 }
 
 static int
 defGetTypeLength(DefElem *def)
 {
 	if (nodeTag(def->arg) == T_Integer)
-		return (intVal(def->arg));
+		return intVal(def->arg);
 	else if (nodeTag(def->arg) == T_String &&
 			 !strcasecmp(strVal(def->arg), "variable"))
 		return -1;				/* variable length */

src/backend/commands/recipe.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.22 1998/08/06 05:12:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.23 1998/09/01 03:22:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -692,7 +692,7 @@ tg_rewriteParamsInExpr(Node *expression, QueryTreeList *inputQlist)
    this code is very similar to ProcedureDefine() in pg_proc.c
 */
 static int
-getParamTypes(TgElement * elem, Oid typev[])
+getParamTypes(TgElement * elem, Oid *typev)
 {
 	/* this code is similar to ProcedureDefine() */
 	int16		parameterCount;

src/backend/commands/remove.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.27 1998/08/19 02:01:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.28 1998/09/01 03:22:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -201,7 +201,7 @@ AttributeAndRelationRemove(Oid typeOid)
 	scan = heap_beginscan(rel, 0, SnapshotNow, 1, key);
 	while (HeapTupleIsValid(tup = heap_getnext(scan, 0)))
 	{
-		optr->reloid = ((AttributeTupleForm) GETSTRUCT(tup))->attrelid;
+		optr->reloid = ((Form_pg_attribute) GETSTRUCT(tup))->attrelid;
 		optr->next = (struct oidlist *) palloc(sizeof(*oidptr));
 		optr = optr->next;
 	}

src/backend/commands/rename.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.15 1998/08/24 01:13:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.16 1998/09/01 03:22:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -164,7 +164,7 @@ renameatt(char *relname,
 	if (!HeapTupleIsValid(oldatttup))
 		elog(ERROR, "renameatt: attribute \"%s\" nonexistent", oldattname);
 
-	if (((AttributeTupleForm) GETSTRUCT(oldatttup))->attnum < 0)
+	if (((Form_pg_attribute) GETSTRUCT(oldatttup))->attnum < 0)
 		elog(ERROR, "renameatt: system attribute \"%s\" not renamed", oldattname);
 
 	newatttup = SearchSysCacheTuple(ATTNAME,
@@ -178,7 +178,7 @@ renameatt(char *relname,
 		elog(ERROR, "renameatt: attribute \"%s\" exists", newattname);
 	}
 
-	StrNCpy((((AttributeTupleForm) (GETSTRUCT(oldatttup)))->attname.data),
+	StrNCpy((((Form_pg_attribute) (GETSTRUCT(oldatttup)))->attname.data),
 			   newattname, NAMEDATALEN);
 
 	attrelation = heap_openr(AttributeRelationName);

src/backend/commands/sequence.c

@@ -38,7 +38,7 @@ typedef struct FormData_pg_sequence
 	char		is_called;
 } FormData_pg_sequence;
 
-typedef FormData_pg_sequence *SequenceTupleForm;
+typedef FormData_pg_sequence *Form_pg_sequence;
 
 typedef struct sequence_magic
 {
@@ -61,8 +61,8 @@ typedef SeqTableData *SeqTable;
 static SeqTable seqtab = NULL;
 
 static SeqTable init_sequence(char *caller, char *name);
-static SequenceTupleForm read_info(char *caller, SeqTable elm, Buffer *buf);
-static void init_params(CreateSeqStmt *seq, SequenceTupleForm new);
+static Form_pg_sequence read_info(char *caller, SeqTable elm, Buffer *buf);
+static void init_params(CreateSeqStmt *seq, Form_pg_sequence new);
 static int	get_param(DefElem *def);
 
 /*
@@ -91,7 +91,7 @@ DefineSequence(CreateSeqStmt *seq)
 	init_params(seq, &new);
 
 	/*
-	 * Create relation (and fill null[] & value[])
+	 * Create relation (and fill *null & *value)
 	 */
 	stmt->tableElts = NIL;
 	for (i = SEQ_COL_FIRSTCOL; i <= SEQ_COL_LASTCOL; i++)
@@ -164,7 +164,7 @@ DefineSequence(CreateSeqStmt *seq)
 
 	RelationSetLockForWrite(rel);
 
-	tupDesc = RelationGetTupleDescriptor(rel);
+	tupDesc = RelationGetDescr(rel);
 
 	Assert(RelationGetNumberOfBlocks(rel) == 0);
 	buf = ReadBuffer(rel, P_NEW);
@@ -199,7 +199,7 @@ nextval(struct varlena * seqin)
 	char	   *seqname = textout(seqin);
 	SeqTable	elm;
 	Buffer		buf;
-	SequenceTupleForm seq;
+	Form_pg_sequence seq;
 	ItemPointerData iptr;
 	int4		incby,
 				maxv,
@@ -216,7 +216,7 @@ nextval(struct varlena * seqin)
 	if (elm->last != elm->cached)		/* some numbers were cached */
 	{
 		elm->last += elm->increment;
-		return (elm->last);
+		return elm->last;
 	}
 
 	seq = read_info("nextval", elm, &buf);		/* lock page and read
@@ -288,7 +288,7 @@ nextval(struct varlena * seqin)
 	ItemPointerSet(&iptr, 0, FirstOffsetNumber);
 	RelationUnsetSingleWLockPage(elm->rel, &iptr);
 
-	return (result);
+	return result;
 
 }
 
@@ -309,7 +309,7 @@ currval(struct varlena * seqin)
 
 	result = elm->last;
 
-	return (result);
+	return result;
 
 }
 
@@ -319,7 +319,7 @@ setval(struct varlena * seqin, int4 next)
 	char	*seqname = textout(seqin);
 	SeqTable	elm;
 	Buffer	buf;
-	SequenceTupleForm seq;
+	Form_pg_sequence seq;
 	ItemPointerData iptr;
 
 #ifndef NO_SECURITY
@@ -356,10 +356,10 @@ setval(struct varlena * seqin, int4 next)
 	ItemPointerSet(&iptr, 0, FirstOffsetNumber);
 	RelationUnsetSingleWLockPage (elm->rel, &iptr);
 
-	return (next);
+	return next;
 }
 
-static SequenceTupleForm
+static Form_pg_sequence
 read_info(char *caller, SeqTable elm, Buffer *buf)
 {
 	ItemPointerData iptr;
@@ -367,7 +367,7 @@ read_info(char *caller, SeqTable elm, Buffer *buf)
 	ItemId		lp;
 	HeapTuple	tuple;
 	sequence_magic *sm;
-	SequenceTupleForm seq;
+	Form_pg_sequence seq;
 
 	ItemPointerSet(&iptr, 0, FirstOffsetNumber);
 	RelationSetSingleWLockPage(elm->rel, &iptr);
@@ -390,11 +390,11 @@ read_info(char *caller, SeqTable elm, Buffer *buf)
 	Assert(ItemIdIsUsed(lp));
 	tuple = (HeapTuple) PageGetItem((Page) page, lp);
 
-	seq = (SequenceTupleForm) GETSTRUCT(tuple);
+	seq = (Form_pg_sequence) GETSTRUCT(tuple);
 
 	elm->increment = seq->increment_by;
 
-	return (seq);
+	return seq;
 
 }
 
@@ -427,7 +427,7 @@ init_sequence(char *caller, char *name)
 /* found */
 	{
 		if (elm->rel != (Relation) NULL)		/* already opened */
-			return (elm);
+			return elm;
 		temp = elm;
 	}
 
@@ -461,7 +461,7 @@ init_sequence(char *caller, char *name)
 			priv->next = elm;
 	}
 
-	return (elm);
+	return elm;
 
 }
 
@@ -494,7 +494,7 @@ CloseSequences(void)
 
 
 static void
-init_params(CreateSeqStmt *seq, SequenceTupleForm new)
+init_params(CreateSeqStmt *seq, Form_pg_sequence new)
 {
 	DefElem    *last_value = NULL;
 	DefElem    *increment_by = NULL;
@@ -591,8 +591,8 @@ get_param(DefElem *def)
 		elog(ERROR, "DefineSequence: \"%s\" value unspecified", def->defname);
 
 	if (nodeTag(def->arg) == T_Integer)
-		return (intVal(def->arg));
+		return intVal(def->arg);
 
 	elog(ERROR, "DefineSequence: \"%s\" is to be integer", def->defname);
-	return (-1);
+	return -1;
 }

src/backend/commands/trigger.c

@@ -57,7 +57,7 @@ CreateTrigger(CreateTrigStmt *stmt)
 	Relation	tgrel;
 	HeapScanDesc tgscan;
 	ScanKeyData key;
-	Relation	relrdesc;
+	Relation	pgrel;
 	HeapTuple	tuple;
 	Relation	idescs[Num_pg_trigger_indices];
 	Relation	ridescs[Num_pg_class_indices];
@@ -225,15 +225,15 @@ CreateTrigger(CreateTrigStmt *stmt)
 	if (!HeapTupleIsValid(tuple))
 		elog(ERROR, "CreateTrigger: relation %s not found in pg_class", stmt->relname);
 
-	relrdesc = heap_openr(RelationRelationName);
+	pgrel = heap_openr(RelationRelationName);
 	((Form_pg_class) GETSTRUCT(tuple))->reltriggers = found + 1;
-	RelationInvalidateHeapTuple(relrdesc, tuple);
-	heap_replace(relrdesc, &tuple->t_ctid, tuple);
+	RelationInvalidateHeapTuple(pgrel, tuple);
+	heap_replace(pgrel, &tuple->t_ctid, tuple);
 	CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, ridescs);
-	CatalogIndexInsert(ridescs, Num_pg_class_indices, relrdesc, tuple);
+	CatalogIndexInsert(ridescs, Num_pg_class_indices, pgrel, tuple);
 	CatalogCloseIndices(Num_pg_class_indices, ridescs);
 	pfree(tuple);
-	heap_close(relrdesc);
+	heap_close(pgrel);
 
 	CommandCounterIncrement();
 	oldcxt = MemoryContextSwitchTo((MemoryContext) CacheCxt);
@@ -252,7 +252,7 @@ DropTrigger(DropTrigStmt *stmt)
 	Relation	tgrel;
 	HeapScanDesc tgscan;
 	ScanKeyData key;
-	Relation	relrdesc;
+	Relation	pgrel;
 	HeapTuple	tuple;
 	Relation	ridescs[Num_pg_class_indices];
 	MemoryContext oldcxt;
@@ -304,15 +304,15 @@ DropTrigger(DropTrigStmt *stmt)
 		elog(ERROR, "DropTrigger: relation %s not found in pg_class", stmt->relname);
 
 	/* update pg_class */
-	relrdesc = heap_openr(RelationRelationName);
+	pgrel = heap_openr(RelationRelationName);
 	((Form_pg_class) GETSTRUCT(tuple))->reltriggers = found;
-	RelationInvalidateHeapTuple(relrdesc, tuple);
-	heap_replace(relrdesc, &tuple->t_ctid, tuple);
+	RelationInvalidateHeapTuple(pgrel, tuple);
+	heap_replace(pgrel, &tuple->t_ctid, tuple);
 	CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, ridescs);
-	CatalogIndexInsert(ridescs, Num_pg_class_indices, relrdesc, tuple);
+	CatalogIndexInsert(ridescs, Num_pg_class_indices, pgrel, tuple);
 	CatalogCloseIndices(Num_pg_class_indices, ridescs);
 	pfree(tuple);
-	heap_close(relrdesc);
+	heap_close(pgrel);
 
 	CommandCounterIncrement();
 	oldcxt = MemoryContextSwitchTo((MemoryContext) CacheCxt);
@@ -631,7 +631,7 @@ ExecBRInsertTriggers(Relation rel, HeapTuple trigtuple)
 	}
 	CurrentTriggerData = NULL;
 	pfree(SaveTriggerData);
-	return (newtuple);
+	return newtuple;
 }
 
 void
@@ -670,7 +670,7 @@ ExecBRDeleteTriggers(Relation rel, ItemPointer tupleid)
 
 	trigtuple = GetTupleForTrigger(rel, tupleid, true);
 	if (trigtuple == NULL)
-		return (false);
+		return false;
 
 	SaveTriggerData = (TriggerData *) palloc(sizeof(TriggerData));
 	SaveTriggerData->tg_event =
@@ -690,7 +690,7 @@ ExecBRDeleteTriggers(Relation rel, ItemPointer tupleid)
 	pfree(SaveTriggerData);
 	pfree(trigtuple);
 
-	return ((newtuple == NULL) ? false : true);
+	return (newtuple == NULL) ? false : true;
 }
 
 void
@@ -736,7 +736,7 @@ ExecBRUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple newtuple)
 
 	trigtuple = GetTupleForTrigger(rel, tupleid, true);
 	if (trigtuple == NULL)
-		return (NULL);
+		return NULL;
 
 	SaveTriggerData = (TriggerData *) palloc(sizeof(TriggerData));
 	SaveTriggerData->tg_event =
@@ -757,7 +757,7 @@ ExecBRUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple newtuple)
 	CurrentTriggerData = NULL;
 	pfree(SaveTriggerData);
 	pfree(trigtuple);
-	return (newtuple);
+	return newtuple;
 }
 
 void
@@ -816,7 +816,7 @@ GetTupleForTrigger(Relation relation, ItemPointer tid, bool before)
 		{
 			elog(NOTICE, "GetTupleForTrigger: Non-functional delete/update");
 			ReleaseBuffer(b);
-			return (NULL);
+			return NULL;
 		}
 
 		HeapTupleSatisfies(lp, relation, b, dp,
@@ -831,5 +831,5 @@ GetTupleForTrigger(Relation relation, ItemPointer tid, bool before)
 	tuple = heap_copytuple(tuple);
 	ReleaseBuffer(b);
 
-	return (tuple);
+	return tuple;
 }

src/backend/commands/user.c

@@ -125,7 +125,7 @@ DefineUser(CreateUserStmt *stmt)
 	 * exist.
 	 */
 	pg_shadow_rel = heap_openr(ShadowRelationName);
-	pg_shadow_dsc = RelationGetTupleDescriptor(pg_shadow_rel);
+	pg_shadow_dsc = RelationGetDescr(pg_shadow_rel);
 
 	/*
 	 * Secure a write lock on pg_shadow so we can be sure of what the next
@@ -247,7 +247,7 @@ AlterUser(AlterUserStmt *stmt)
 	 * Scan the pg_shadow relation to be certain the user exists.
 	 */
 	pg_shadow_rel = heap_openr(ShadowRelationName);
-	pg_shadow_dsc = RelationGetTupleDescriptor(pg_shadow_rel);
+	pg_shadow_dsc = RelationGetDescr(pg_shadow_rel);
 
 	/*
 	 * Secure a write lock on pg_shadow so we can be sure that when the
@@ -363,7 +363,7 @@ RemoveUser(char *user)
 	 * message.
 	 */
 	pg_shadow_rel = heap_openr(ShadowRelationName);
-	pg_dsc = RelationGetTupleDescriptor(pg_shadow_rel);
+	pg_dsc = RelationGetDescr(pg_shadow_rel);
 
 	/*
 	 * Secure a write lock on pg_shadow so we can be sure that when the
@@ -390,7 +390,7 @@ RemoveUser(char *user)
 	 * owned by usesysid.  Then drop them.
 	 */
 	pg_rel = heap_openr(DatabaseRelationName);
-	pg_dsc = RelationGetTupleDescriptor(pg_rel);
+	pg_dsc = RelationGetDescr(pg_rel);
 
 	scan = heap_beginscan(pg_rel, false, SnapshotNow, 0, NULL);
 	while (HeapTupleIsValid(tuple = heap_getnext(scan, 0)))

src/backend/commands/variable.c

@@ -2,7 +2,7 @@
  * Routines for handling of 'SET var TO',
  *	'SHOW var' and 'RESET var' statements.
  *
- * $Id: variable.c,v 1.10 1998/07/26 04:30:26 scrappy Exp $
+ * $Id: variable.c,v 1.11 1998/09/01 03:22:10 momjian Exp $
  *
  */
 
@@ -73,13 +73,13 @@ get_token(char **tok, char **val, const char *str)
 	/* end of string? */
 	if (!(*str))
 	{
-		return (str);
+		return str;
 
 		/* delimiter? */
 	}
 	else if (*str == ',')
 	{
-		return (++str);
+		return ++str;
 
 	}
 	else if ((val == NULL) || (*str != '='))
@@ -117,9 +117,9 @@ get_token(char **tok, char **val, const char *str)
 		str++;
 
 	if (!(*str))
-		return (NULL);
+		return NULL;
 	if (*str == ',')
-		return (++str);
+		return ++str;
 
 	elog(ERROR, "Syntax error near (%s)", str);
 

src/backend/executor/execFlatten.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.5 1997/09/08 21:42:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.6 1998/09/01 03:22:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -222,7 +222,7 @@ FjoinBumpOuterNodes(TargetEntry *tlist,
 	if (funcIsDone)
 	{
 		set_fj_initialized(fjNode, false);
-		return (true);
+		return true;
 	}
 
 	/*

src/backend/executor/execJunk.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.13 1998/07/20 20:48:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.14 1998/09/01 03:22:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -244,7 +244,7 @@ ExecInitJunkFilter(List *targetList)
 	junkfilter->jf_cleanTupType = cleanTupType;
 	junkfilter->jf_cleanMap = cleanMap;
 
-	return (junkfilter);
+	return junkfilter;
 
 }
 
@@ -301,7 +301,7 @@ ExecGetJunkAttribute(JunkFilter *junkfilter,
 	if (resno == InvalidAttrNumber)
 	{
 		/* Ooops! We couldn't find this attribute... */
-		return (false);
+		return false;
 	}
 
 	/* ---------------------
@@ -414,5 +414,5 @@ ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot)
 		pfree(nulls);
 	}
 
-	return (cleanTuple);
+	return cleanTuple;
 }

src/backend/executor/execMain.c

@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.53 1998/08/19 02:01:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.54 1998/09/01 03:22:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -839,7 +839,7 @@ ExecutePlan(EState *estate,
 
 				/*
 				 * Total hack. I'm ignoring any accessor functions for
-				 * Relation, RelationTupleForm, NameData. Assuming that
+				 * Relation, RelationForm, NameData. Assuming that
 				 * NameData.data has offset 0.
 				 */
 			case CMD_NOTIFY:
@@ -1288,7 +1288,7 @@ ExecAttrDefault(Relation rel, HeapTuple tuple)
 	pfree(econtext);
 
 	if (repl == NULL)
-		return (tuple);
+		return tuple;
 
 	newtuple = heap_modifytuple(tuple, rel, replValue, replNull, repl);
 
@@ -1297,7 +1297,7 @@ ExecAttrDefault(Relation rel, HeapTuple tuple)
 	pfree(replNull);
 	pfree(replValue);
 
-	return (newtuple);
+	return newtuple;
 
 }
 
@@ -1346,7 +1346,7 @@ ExecRelCheck(Relation rel, HeapTuple tuple)
 		pfree(qual);
 
 		if (!res)
-			return (check[i].ccname);
+			return check[i].ccname;
 	}
 
 	pfree(slot);
@@ -1355,7 +1355,7 @@ ExecRelCheck(Relation rel, HeapTuple tuple)
 	pfree(rtlist);
 	pfree(econtext);
 
-	return ((char *) NULL);
+	return (char *) NULL;
 
 }
 
@@ -1391,5 +1391,5 @@ ExecConstraints(char *caller, Relation rel, HeapTuple tuple)
 			elog(ERROR, "%s: rejected due to CHECK constraint %s", caller, failed);
 	}
 
-	return (newtuple);
+	return newtuple;
 }

src/backend/executor/execTuples.c

@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.19 1998/07/15 14:54:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.20 1998/09/01 03:22:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -869,7 +869,7 @@ ExecCopyTupType(TupleDesc td, int natts)
 	while (i < natts)
 		{
 			newTd[i] =
-				(AttributeTupleForm)palloc(sizeof(FormData_pg_attribute));
+				(Form_pg_attribute)palloc(sizeof(FormData_pg_attribute));
 			memmove(newTd[i], td[i], sizeof(FormData_pg_attribute));
 			i++;
 		}