17 files changed, 118 insertions, 118 deletions

diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c
index 92bef496fcc..24b524fbf55 100644
--- a/src/backend/executor/execFlatten.c
+++ b/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;
 	}
 
 	/*
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index 9e4937e4682..bba39a183f2 100644
--- a/src/backend/executor/execJunk.c
+++ b/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;
 }
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 41943446a7e..3d782f34b0a 100644
--- a/src/backend/executor/execMain.c
+++ b/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;
 }
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index 8f167b8546c..87c411475c9 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.11 1998/06/15 19:28:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.12 1998/09/01 03:22:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -123,7 +123,7 @@ ExecInitNode(Plan *node, EState *estate, Plan *parent)
 	{
 		result = ExecInitSubPlan((SubPlan *) lfirst(subp), estate, node);
 		if (result == FALSE)
-			return (FALSE);
+			return FALSE;
 	}
 
 	switch (nodeTag(node))
@@ -211,7 +211,7 @@ ExecInitNode(Plan *node, EState *estate, Plan *parent)
 		{
 			result = ExecInitSubPlan((SubPlan *) lfirst(subp), estate, node);
 			if (result == FALSE)
-				return (FALSE);
+				return FALSE;
 		}
 	}
 
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 55a16f53b2f..72de0b8faf7 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.34 1998/08/01 22:12:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.35 1998/09/01 03:22:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -390,7 +390,7 @@ ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull)
 			ExecSetParamPlan(prm->execPlan);
 		Assert(prm->execPlan == NULL);
 		*isNull = prm->isnull;
-		return (prm->value);
+		return prm->value;
 	}
 
 	thisParameterName = expression->paramname;
@@ -487,7 +487,7 @@ ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull)
 								 tle, tup, isNull);
 		return value;
 	}
-	return (paramList->value);
+	return paramList->value;
 }
 
 
@@ -545,7 +545,7 @@ att_by_num(TupleTableSlot *slot,
 		   AttrNumber attrno,
 		   bool *isNull)
 {
-	return (GetAttributeByNum(slot, attrno, isNull));
+	return GetAttributeByNum(slot, attrno, isNull);
 }
 
 #endif
@@ -604,7 +604,7 @@ GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull)
 char *
 att_by_name(TupleTableSlot *slot, char *attname, bool *isNull)
 {
-	return (GetAttributeByName(slot, attname, isNull));
+	return GetAttributeByName(slot, attname, isNull);
 }
 
 #endif
@@ -829,7 +829,7 @@ ExecMakeFunctionResult(Node *node,
 			if (fcache->nullVect[i] == true)
 				*isNull = true;
 
-		return ((Datum) fmgr_c(&fcache->func, (FmgrValues *) argV, isNull));
+		return (Datum) fmgr_c(&fcache->func, (FmgrValues *) argV, isNull);
 	}
 }
 
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 90ba4e5f110..9517b731b2b 100644
--- a/src/backend/executor/execTuples.c
+++ b/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++;
 		}
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index bbc8e2d9408..7cc53dce485 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.36 1998/08/20 22:07:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.37 1998/09/01 03:22:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,7 +58,7 @@
 #include "utils/mcxt.h"
 
 static void
-ExecGetIndexKeyInfo(IndexTupleForm indexTuple, int *numAttsOutP,
+ExecGetIndexKeyInfo(Form_pg_index indexTuple, int *numAttsOutP,
 					AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP);
 
 /* ----------------------------------------------------------------
@@ -484,7 +484,7 @@ ExecSetTypeInfo(int index,
 				bool attbyVal,
 				char attalign)
 {
-	AttributeTupleForm att;
+	Form_pg_attribute att;
 
 	/* ----------------
 	 *	get attribute pointer and preform a sanity check..
@@ -600,7 +600,7 @@ QueryDescGetTypeInfo(QueryDesc *queryDesc)
  * ----------------------------------------------------------------
  */
 static void
-ExecGetIndexKeyInfo(IndexTupleForm indexTuple,
+ExecGetIndexKeyInfo(Form_pg_index indexTuple,
 					int *numAttsOutP,
 					AttrNumber **attsOutP,
 					FuncIndexInfoPtr fInfoP)
@@ -706,7 +706,7 @@ ExecOpenIndices(Oid resultRelationOid,
 	HeapScanDesc indexSd;
 	ScanKeyData key;
 	HeapTuple	tuple;
-	IndexTupleForm indexStruct;
+	Form_pg_index indexStruct;
 	Oid			indexOid;
 	List	   *oidList;
 	List	   *nkeyList;
@@ -770,7 +770,7 @@ ExecOpenIndices(Oid resultRelationOid,
 		 *	first get the oid of the index relation from the tuple
 		 * ----------------
 		 */
-		indexStruct = (IndexTupleForm) GETSTRUCT(tuple);
+		indexStruct = (Form_pg_index) GETSTRUCT(tuple);
 		indexOid = indexStruct->indexrelid;
 
 		/* ----------------
@@ -1005,8 +1005,8 @@ ExecFormIndexTuple(HeapTuple heapTuple,
 	 *	how to form the index tuples..
 	 * ----------------
 	 */
-	heapDescriptor = RelationGetTupleDescriptor(heapRelation);
-	indexDescriptor = RelationGetTupleDescriptor(indexRelation);
+	heapDescriptor = RelationGetDescr(heapRelation);
+	indexDescriptor = RelationGetDescr(indexRelation);
 
 	/* ----------------
 	 *	FormIndexDatum fills in its datum and null parameters
@@ -1124,7 +1124,7 @@ ExecInsertIndexTuples(TupleTableSlot *slot,
 		fInfoP = indexInfo->ii_FuncIndexInfo;
 		datum = (Datum *) palloc(numberOfAttributes * sizeof *datum);
 		nulls = (char *) palloc(numberOfAttributes * sizeof *nulls);
-		heapDescriptor = (TupleDesc) RelationGetTupleDescriptor(heapRelation);
+		heapDescriptor = (TupleDesc) RelationGetDescr(heapRelation);
 
 		FormIndexDatum(numberOfAttributes,		/* num attributes */
 					   keyAttributeNumbers,		/* array of att nums to
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 645a312fbf8..4d23d27178f 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.18 1998/08/24 01:37:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.19 1998/09/01 03:22:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -276,7 +276,7 @@ copy_function_result(FunctionCachePtr fcache,
 		while (i < oldTuple->t_natts)
 		{
 			funcTd->attrs[i] =
-				(AttributeTupleForm) palloc(ATTRIBUTE_TUPLE_SIZE);
+				(Form_pg_attribute) palloc(ATTRIBUTE_TUPLE_SIZE);
 			memmove(funcTd->attrs[i],
 					resultTd->attrs[i],
 					ATTRIBUTE_TUPLE_SIZE);
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index eb99a1d08e8..9fa3f011905 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.21 1998/06/15 19:28:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.22 1998/09/01 03:22:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -438,7 +438,7 @@ ExecHashTableCreate(Hash *node)
 		bucket->firstotuple = bucket->lastotuple = -1;
 		bucket = (HashBucket) LONGALIGN(((char *) bucket + bucketsize));
 	}
-	return (hashtable);
+	return hashtable;
 }
 
 /* ----------------------------------------------------------------
@@ -586,7 +586,7 @@ ExecHashGetBucket(HashJoinTable hashtable,
 		printf("hash(%d) = %d\n", keyval, bucketno);
 #endif
 
-	return (bucketno);
+	return bucketno;
 }
 
 /* ----------------------------------------------------------------
@@ -810,7 +810,7 @@ hashFunc(char *key, int len)
 		h = h * PRIME1 ^ (*k++);
 	h %= PRIME2;
 
-	return (h);
+	return h;
 }
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 9a99e80da58..c4a52fe9101 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.11 1998/02/26 04:31:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.12 1998/09/01 03:22:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -155,7 +155,7 @@ ExecHashJoin(HashJoin *node)
 		node->hashdone = true;
 	}
 	else if (hashtable == NULL)
-		return (NULL);
+		return NULL;
 
 	nbatch = hashtable->nbatch;
 	outerbatches = hjstate->hj_OuterBatches;
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index e4ebd01055e..03b43f09b55 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.25 1998/08/19 15:47:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.26 1998/09/01 03:22:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -954,7 +954,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent)
 	 *	get the scan type from the relation descriptor.
 	 * ----------------
 	 */
-	ExecAssignScanType(scanstate, RelationGetTupleDescriptor(currentRelation));
+	ExecAssignScanType(scanstate, RelationGetDescr(currentRelation));
 	ExecAssignResultTypeFromTL((Plan *) node, &scanstate->cstate);
 
 	/* ----------------
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index 3d5496c7e66..1c957d76612 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.15 1998/08/19 02:02:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.16 1998/09/01 03:22:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -145,7 +145,7 @@ ExecMaterial(Material *node)
 		matstate->csstate.css_currentScanDesc = currentScanDesc;
 
 		ExecAssignScanType(&matstate->csstate,
-						   RelationGetTupleDescriptor(currentRelation));
+						   RelationGetDescr(currentRelation));
 
 		/* ----------------
 		 *	finally set the sorted flag to true
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 80bdef82937..6b2972d4102 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.12 1998/08/19 02:02:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.13 1998/09/01 03:22:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -185,7 +185,7 @@ InitScanRelation(SeqScan *node, EState *estate,
 		scanstate->css_currentScanDesc = currentScanDesc;
 
 		ExecAssignScanType(scanstate,
-						   RelationGetTupleDescriptor(currentRelation));
+						   RelationGetDescr(currentRelation));
 	}
 	else
 	{
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 7c27a260828..dd9ca22c656 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.15 1998/06/15 19:28:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.16 1998/09/01 03:22:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -192,7 +192,7 @@ ExecSort(Sort *node)
 	 */
 	heapTuple = psort_grabtuple(node, &should_free);
 
-	return (ExecStoreTuple(heapTuple, slot, InvalidBuffer, should_free));
+	return ExecStoreTuple(heapTuple, slot, InvalidBuffer, should_free);
 }
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index cba1e04c884..95fa2f0afe2 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -67,11 +67,11 @@ ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext)
 		if (sublink->subLinkType == EXPR_SUBLINK && found)
 		{
 			elog(ERROR, "ExecSubPlan: more than one tuple returned by expression subselect");
-			return ((Datum) false);
+			return (Datum) false;
 		}
 
 		if (sublink->subLinkType == EXISTS_SUBLINK)
-			return ((Datum) true);
+			return (Datum) true;
 
 		found = true;
 
@@ -96,9 +96,9 @@ ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext)
 	}
 
 	if (!found && sublink->subLinkType == ALL_SUBLINK)
-		return ((Datum) true);
+		return (Datum) true;
 
-	return ((Datum) result);
+	return (Datum) result;
 }
 
 /* ----------------------------------------------------------------
@@ -123,7 +123,7 @@ ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent)
 	sp_estate->es_refcount = estate->es_refcount;
 
 	if (!ExecInitNode(node->plan, sp_estate, NULL))
-		return (false);
+		return false;
 
 	node->shutdown = true;
 
@@ -149,7 +149,7 @@ ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent)
 		 */
 	}
 
-	return (true);
+	return true;
 }
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/nodeTee.c
index c7a0a99a277..b96cac45adc 100644
--- a/src/backend/executor/nodeTee.c
+++ b/src/backend/executor/nodeTee.c
@@ -15,7 +15,7 @@
  *		ExecEndTee
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.21 1998/08/19 02:02:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.22 1998/09/01 03:22:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -402,7 +402,7 @@ ExecTee(Tee *node, Plan *parent)
 			IncrBufferRefCount(scanDesc->rs_cbuf);
 
 		slot = teeState->cstate.cs_ResultTupleSlot;
-		slot->ttc_tupleDescriptor = RelationGetTupleDescriptor(bufferRel);
+		slot->ttc_tupleDescriptor = RelationGetDescr(bufferRel);
 
 		result = ExecStoreTuple(heapTuple,		/* tuple to store */
 								slot,	/* slot to store in */
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 0f559e1bcdf..17f81537eea 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -102,7 +102,7 @@ SPI_connect()
 	 * to _SPI_connected
 	 */
 	if (_SPI_curid != _SPI_connected)
-		return (SPI_ERROR_CONNECT);
+		return SPI_ERROR_CONNECT;
 
 	if (_SPI_stack == NULL)
 	{
@@ -141,7 +141,7 @@ SPI_connect()
 	_SPI_current->savedId = GetScanCommandId();
 	SetScanCommandId(GetCurrentCommandId());
 
-	return (SPI_OK_CONNECT);
+	return SPI_OK_CONNECT;
 
 }
 
@@ -152,7 +152,7 @@ SPI_finish()
 
 	res = _SPI_begin_call(false);		/* live in procedure memory */
 	if (res < 0)
-		return (res);
+		return res;
 
 	/* Restore memory context as it was before procedure call */
 	MemoryContextSwitchTo(_SPI_current->savedcxt);
@@ -179,7 +179,7 @@ SPI_finish()
 		_SPI_current = &(_SPI_stack[_SPI_connected]);
 	}
 
-	return (SPI_OK_FINISH);
+	return SPI_OK_FINISH;
 
 }
 
@@ -189,16 +189,16 @@ SPI_exec(char *src, int tcount)
 	int			res;
 
 	if (src == NULL || tcount < 0)
-		return (SPI_ERROR_ARGUMENT);
+		return SPI_ERROR_ARGUMENT;
 
 	res = _SPI_begin_call(true);
 	if (res < 0)
-		return (res);
+		return res;
 
 	res = _SPI_execute(src, tcount, NULL);
 
 	_SPI_end_call(true);
-	return (res);
+	return res;
 }
 
 int
@@ -207,14 +207,14 @@ SPI_execp(void *plan, Datum *Values, char *Nulls, int tcount)
 	int			res;
 
 	if (plan == NULL || tcount < 0)
-		return (SPI_ERROR_ARGUMENT);
+		return SPI_ERROR_ARGUMENT;
 
 	if (((_SPI_plan *) plan)->nargs > 0 && Values == NULL)
-		return (SPI_ERROR_PARAM);
+		return SPI_ERROR_PARAM;
 
 	res = _SPI_begin_call(true);
 	if (res < 0)
-		return (res);
+		return res;
 
 	/* copy plan to current (executor) context */
 	plan = (void *) _SPI_copy_plan(plan, _SPI_CPLAN_CURCXT);
@@ -222,7 +222,7 @@ SPI_execp(void *plan, Datum *Values, char *Nulls, int tcount)
 	res = _SPI_execute_plan((_SPI_plan *) plan, Values, Nulls, tcount);
 
 	_SPI_end_call(true);
-	return (res);
+	return res;
 }
 
 void *
@@ -233,12 +233,12 @@ SPI_prepare(char *src, int nargs, Oid *argtypes)
 	if (src == NULL || nargs < 0 || (nargs > 0 && argtypes == NULL))
 	{
 		SPI_result = SPI_ERROR_ARGUMENT;
-		return (NULL);
+		return NULL;
 	}
 
 	SPI_result = _SPI_begin_call(true);
 	if (SPI_result < 0)
-		return (NULL);
+		return NULL;
 
 	plan = (_SPI_plan *) palloc(sizeof(_SPI_plan));		/* Executor context */
 	plan->argtypes = argtypes;
@@ -253,7 +253,7 @@ SPI_prepare(char *src, int nargs, Oid *argtypes)
 
 	_SPI_end_call(true);
 
-	return ((void *) plan);
+	return (void *) plan;
 
 }
 
@@ -265,19 +265,19 @@ SPI_saveplan(void *plan)
 	if (plan == NULL)
 	{
 		SPI_result = SPI_ERROR_ARGUMENT;
-		return (NULL);
+		return NULL;
 	}
 
 	SPI_result = _SPI_begin_call(false);		/* don't change context */
 	if (SPI_result < 0)
-		return (NULL);
+		return NULL;
 
 	newplan = _SPI_copy_plan((_SPI_plan *) plan, _SPI_CPLAN_TOPCXT);
 
 	_SPI_curid--;
 	SPI_result = 0;
 
-	return ((void *) newplan);
+	return (void *) newplan;
 
 }
 
@@ -290,7 +290,7 @@ SPI_copytuple(HeapTuple tuple)
 	if (tuple == NULL)
 	{
 		SPI_result = SPI_ERROR_ARGUMENT;
-		return (NULL);
+		return NULL;
 	}
 
 	if (_SPI_curid + 1 == _SPI_connected)		/* connected */
@@ -305,7 +305,7 @@ SPI_copytuple(HeapTuple tuple)
 	if (oldcxt)
 		MemoryContextSwitchTo(oldcxt);
 
-	return (ctuple);
+	return ctuple;
 }
 
 HeapTuple
@@ -324,7 +324,7 @@ SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, int *attnum,
 	if (rel == NULL || tuple == NULL || natts <= 0 || attnum == NULL || Values == NULL)
 	{
 		SPI_result = SPI_ERROR_ARGUMENT;
-		return (NULL);
+		return NULL;
 	}
 
 	if (_SPI_curid + 1 == _SPI_connected)		/* connected */
@@ -354,7 +354,7 @@ SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, int *attnum,
 		n[attnum[i] - 1] = (Nulls && Nulls[i] == 'n') ? 'n' : ' ';
 	}
 
-	if (i == natts)				/* no errors in attnum[] */
+	if (i == natts)				/* no errors in *attnum */
 	{
 		mtuple = heap_formtuple(rel->rd_att, v, n);
 		infomask = mtuple->t_infomask;
@@ -375,7 +375,7 @@ SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, int *attnum,
 	if (oldcxt)
 		MemoryContextSwitchTo(oldcxt);
 
-	return (mtuple);
+	return mtuple;
 }
 
 int
@@ -386,10 +386,10 @@ SPI_fnumber(TupleDesc tupdesc, char *fname)
 	for (res = 0; res < tupdesc->natts; res++)
 	{
 		if (strcasecmp(tupdesc->attrs[res]->attname.data, fname) == 0)
-			return (res + 1);
+			return res + 1;
 	}
 
-	return (SPI_ERROR_NOATTRIBUTE);
+	return SPI_ERROR_NOATTRIBUTE;
 }
 
 char *
@@ -400,10 +400,10 @@ SPI_fname(TupleDesc tupdesc, int fnumber)
 	if (tupdesc->natts < fnumber || fnumber <= 0)
 	{
 		SPI_result = SPI_ERROR_NOATTRIBUTE;
-		return (NULL);
+		return NULL;
 	}
 
-	return (nameout(&(tupdesc->attrs[fnumber - 1]->attname)));
+	return nameout(&(tupdesc->attrs[fnumber - 1]->attname));
 }
 
 char *
@@ -417,17 +417,17 @@ SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber)
 	if (tuple->t_natts < fnumber || fnumber <= 0)
 	{
 		SPI_result = SPI_ERROR_NOATTRIBUTE;
-		return (NULL);
+		return NULL;
 	}
 
 	val = heap_getattr(tuple, fnumber, tupdesc, &isnull);
 	if (isnull)
-		return (NULL);
+		return NULL;
 	foutoid = typtoout((Oid) tupdesc->attrs[fnumber - 1]->atttypid);
 	if (!OidIsValid(foutoid))
 	{
 		SPI_result = SPI_ERROR_NOOUTFUNC;
-		return (NULL);
+		return NULL;
 	}
 
 	return (fmgr(foutoid, val,
@@ -445,12 +445,12 @@ SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool *isnull)
 	if (tuple->t_natts < fnumber || fnumber <= 0)
 	{
 		SPI_result = SPI_ERROR_NOATTRIBUTE;
-		return ((Datum) NULL);
+		return (Datum) NULL;
 	}
 
 	val = heap_getattr(tuple, fnumber, tupdesc, isnull);
 
-	return (val);
+	return val;
 }
 
 char *
@@ -462,7 +462,7 @@ SPI_gettype(TupleDesc tupdesc, int fnumber)
 	if (tupdesc->natts < fnumber || fnumber <= 0)
 	{
 		SPI_result = SPI_ERROR_NOATTRIBUTE;
-		return (NULL);
+		return NULL;
 	}
 
 	typeTuple = SearchSysCacheTuple(TYPOID,
@@ -472,10 +472,10 @@ SPI_gettype(TupleDesc tupdesc, int fnumber)
 	if (!HeapTupleIsValid(typeTuple))
 	{
 		SPI_result = SPI_ERROR_TYPUNKNOWN;
-		return (NULL);
+		return NULL;
 	}
 
-	return (pstrdup(((TypeTupleForm) GETSTRUCT(typeTuple))->typname.data));
+	return pstrdup(((Form_pg_type) GETSTRUCT(typeTuple))->typname.data);
 }
 
 Oid
@@ -486,16 +486,16 @@ SPI_gettypeid(TupleDesc tupdesc, int fnumber)
 	if (tupdesc->natts < fnumber || fnumber <= 0)
 	{
 		SPI_result = SPI_ERROR_NOATTRIBUTE;
-		return (InvalidOid);
+		return InvalidOid;
 	}
 
-	return (tupdesc->attrs[fnumber - 1]->atttypid);
+	return tupdesc->attrs[fnumber - 1]->atttypid;
 }
 
 char *
 SPI_getrelname(Relation rel)
 {
-	return (pstrdup(rel->rd_rel->relname.data));
+	return pstrdup(rel->rd_rel->relname.data);
 }
 
 void *
@@ -516,7 +516,7 @@ SPI_palloc(Size size)
 	if (oldcxt)
 		MemoryContextSwitchTo(oldcxt);
 
-	return (pointer);
+	return pointer;
 }
 
 void *
@@ -536,7 +536,7 @@ SPI_repalloc(void *pointer, Size size)
 	if (oldcxt)
 		MemoryContextSwitchTo(oldcxt);
 
-	return (pointer);
+	return pointer;
 }
 
 void
@@ -661,13 +661,13 @@ _SPI_execute(char *src, int tcount, _SPI_plan *plan)
 				CopyStmt   *stmt = (CopyStmt *) (queryTree->utilityStmt);
 
 				if (stmt->filename == NULL)
-					return (SPI_ERROR_COPY);
+					return SPI_ERROR_COPY;
 			}
 			else if (nodeTag(queryTree->utilityStmt) == T_ClosePortalStmt ||
 					 nodeTag(queryTree->utilityStmt) == T_FetchStmt)
-				return (SPI_ERROR_CURSOR);
+				return SPI_ERROR_CURSOR;
 			else if (nodeTag(queryTree->utilityStmt) == T_TransactionStmt)
-				return (SPI_ERROR_TRANSACTION);
+				return SPI_ERROR_TRANSACTION;
 			res = SPI_OK_UTILITY;
 			if (plan == NULL)
 			{
@@ -675,7 +675,7 @@ _SPI_execute(char *src, int tcount, _SPI_plan *plan)
 				if (i < qlen - 1)
 					CommandCounterIncrement();
 				else
-					return (res);
+					return res;
 			}
 			else if (i >= qlen - 1)
 				break;
@@ -687,7 +687,7 @@ _SPI_execute(char *src, int tcount, _SPI_plan *plan)
 			state = CreateExecutorState();
 			res = _SPI_pquery(qdesc, state, (i < qlen - 1) ? 0 : tcount);
 			if (res < 0 || i >= qlen - 1)
-				return (res);
+				return res;
 			CommandCounterIncrement();
 		}
 		else
@@ -696,7 +696,7 @@ _SPI_execute(char *src, int tcount, _SPI_plan *plan)
 									(i < qlen - 1) ? None : SPI);
 			res = _SPI_pquery(qdesc, NULL, (i < qlen - 1) ? 0 : tcount);
 			if (res < 0)
-				return (res);
+				return res;
 			if (i >= qlen - 1)
 				break;
 		}
@@ -705,7 +705,7 @@ _SPI_execute(char *src, int tcount, _SPI_plan *plan)
 	plan->qtlist = queryTree_list;
 	plan->ptlist = ptlist;
 
-	return (res);
+	return res;
 
 }
 
@@ -745,7 +745,7 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, char *Nulls, int tcount)
 			if (i < qlen - 1)
 				CommandCounterIncrement();
 			else
-				return (SPI_OK_UTILITY);
+				return SPI_OK_UTILITY;
 		}
 		else
 		{
@@ -771,12 +771,12 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, char *Nulls, int tcount)
 				state->es_param_list_info = NULL;
 			res = _SPI_pquery(qdesc, state, (i < qlen - 1) ? 0 : tcount);
 			if (res < 0 || i >= qlen - 1)
-				return (res);
+				return res;
 			CommandCounterIncrement();
 		}
 	}
 
-	return (res);
+	return res;
 
 }
 
@@ -803,7 +803,7 @@ _SPI_pquery(QueryDesc *queryDesc, EState *state, int tcount)
 				intoName = parseTree->into;
 				parseTree->isBinary = false;	/* */
 
-				return (SPI_ERROR_CURSOR);
+				return SPI_ERROR_CURSOR;
 
 			}
 			else if (parseTree->into != NULL)	/* select into table */
@@ -823,11 +823,11 @@ _SPI_pquery(QueryDesc *queryDesc, EState *state, int tcount)
 			res = SPI_OK_UPDATE;
 			break;
 		default:
-			return (SPI_ERROR_OPUNKNOWN);
+			return SPI_ERROR_OPUNKNOWN;
 	}
 
 	if (state == NULL)			/* plan preparation */
-		return (res);
+		return res;
 #ifdef SPI_EXECUTOR_STATS
 	if (ShowExecutorStats)
 		ResetUsage();
@@ -843,7 +843,7 @@ _SPI_pquery(QueryDesc *queryDesc, EState *state, int tcount)
 					  state,
 					  tupdesc,
 					  None);
-		return (SPI_OK_CURSOR);
+		return SPI_OK_CURSOR;
 	}
 
 	ExecutorRun(queryDesc, state, EXEC_FOR, tcount);
@@ -872,7 +872,7 @@ _SPI_pquery(QueryDesc *queryDesc, EState *state, int tcount)
 	}
 	queryDesc->dest = dest;
 
-	return (res);
+	return res;
 
 }
 
@@ -925,7 +925,7 @@ _SPI_execmem()
 	phmem = PortalGetHeapMemory(_SPI_current->portal);
 	oldcxt = MemoryContextSwitchTo((MemoryContext) phmem);
 
-	return (oldcxt);
+	return oldcxt;
 
 }
 
@@ -938,7 +938,7 @@ _SPI_procmem()
 	pvmem = PortalGetVariableMemory(_SPI_current->portal);
 	oldcxt = MemoryContextSwitchTo((MemoryContext) pvmem);
 
-	return (oldcxt);
+	return oldcxt;
 
 }
 
@@ -950,7 +950,7 @@ static int
 _SPI_begin_call(bool execmem)
 {
 	if (_SPI_curid + 1 != _SPI_connected)
-		return (SPI_ERROR_UNCONNECTED);
+		return SPI_ERROR_UNCONNECTED;
 	_SPI_curid++;
 	if (_SPI_current != &(_SPI_stack[_SPI_curid]))
 		elog(FATAL, "SPI: stack corrupted");
@@ -961,7 +961,7 @@ _SPI_begin_call(bool execmem)
 		StartPortalAllocMode(DefaultAllocMode, 0);
 	}
 
-	return (0);
+	return 0;
 }
 
 static int
@@ -986,7 +986,7 @@ _SPI_end_call(bool procmem)
 		_SPI_procmem();
 	}
 
-	return (0);
+	return 0;
 }
 
 static bool
@@ -1010,7 +1010,7 @@ _SPI_checktuples()
 			failed = true;
 	}
 
-	return (failed);
+	return failed;
 }
 
 static _SPI_plan *
@@ -1048,5 +1048,5 @@ _SPI_copy_plan(_SPI_plan *plan, int location)
 	if (location != _SPI_CPLAN_CURCXT)
 		MemoryContextSwitchTo(oldcxt);
 
-	return (newplan);
+	return newplan;
 }