Cleanup of source files where 'return' or 'var =' is alone on a line.

5 files changed, 32 insertions, 59 deletions

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index eef7dbea0c..2b20186d2f 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.71 1999/02/02 03:44:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.72 1999/02/03 21:15:54 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -130,8 +130,7 @@ static FormData_pg_attribute a6 = {
 	MaxCommandIdAttributeNumber, 0, -1, -1, '\001', '\0', 'i', '\0', '\0'
 };
 
-static Form_pg_attribute HeapAtt[] =
-{&a1, &a2, &a3, &a4, &a5, &a6};
+static Form_pg_attribute HeapAtt[] = {&a1, &a2, &a3, &a4, &a5, &a6};
 
 /* ----------------------------------------------------------------
  *				XXX END OF UGLY HARD CODED BADNESS XXX
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 800dc2c3f9..2aee180dd4 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.68 1999/02/02 03:44:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.69 1999/02/03 21:15:54 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -436,8 +436,7 @@ ConstructIndexReldesc(Relation indexRelation, Oid amoid)
 
 	oldcxt = MemoryContextSwitchTo((MemoryContext) CacheCxt);
 
-	indexRelation->rd_am =
-		AccessMethodObjectIdGetForm(amoid);
+	indexRelation->rd_am = AccessMethodObjectIdGetForm(amoid);
 
 	MemoryContextSwitchTo(oldcxt);
 
@@ -802,8 +801,7 @@ UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate)
 	newPred = NULL;
 	if (predicate != NULL)
 	{
-		newPred =
-			(Node *) make_orclause(lcons(make_andclause((List *) predicate),
+		newPred = (Node *) make_orclause(lcons(make_andclause((List *) predicate),
 								  lcons(make_andclause((List *) oldPred),
 										NIL)));
 		newPred = (Node *) cnfify((Expr *) newPred, true);
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index 4dba8740ee..dc15786b1a 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.18 1998/11/27 19:51:50 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.19 1999/02/03 21:15:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -206,43 +206,29 @@ AggregateCreate(char *aggName,
 	}
 	namestrcpy(&aname, aggName);
 	values[Anum_pg_aggregate_aggname - 1] = NameGetDatum(&aname);
-	values[Anum_pg_aggregate_aggowner - 1] =
-		Int32GetDatum(GetUserId());
-	values[Anum_pg_aggregate_aggtransfn1 - 1] =
-		ObjectIdGetDatum(xfn1);
-	values[Anum_pg_aggregate_aggtransfn2 - 1] =
-		ObjectIdGetDatum(xfn2);
-	values[Anum_pg_aggregate_aggfinalfn - 1] =
-		ObjectIdGetDatum(ffn);
+	values[Anum_pg_aggregate_aggowner - 1] = Int32GetDatum(GetUserId());
+	values[Anum_pg_aggregate_aggtransfn1 - 1] = ObjectIdGetDatum(xfn1);
+	values[Anum_pg_aggregate_aggtransfn2 - 1] = ObjectIdGetDatum(xfn2);
+	values[Anum_pg_aggregate_aggfinalfn - 1] = ObjectIdGetDatum(ffn);
 
-	values[Anum_pg_aggregate_aggbasetype - 1] =
-		ObjectIdGetDatum(xbase);
+	values[Anum_pg_aggregate_aggbasetype - 1] = ObjectIdGetDatum(xbase);
 	if (!OidIsValid(xfn1))
 	{
-		values[Anum_pg_aggregate_aggtranstype1 - 1] =
-			ObjectIdGetDatum(InvalidOid);
-		values[Anum_pg_aggregate_aggtranstype2 - 1] =
-			ObjectIdGetDatum(xret2);
-		values[Anum_pg_aggregate_aggfinaltype - 1] =
-			ObjectIdGetDatum(xret2);
+		values[Anum_pg_aggregate_aggtranstype1 - 1] = ObjectIdGetDatum(InvalidOid);
+		values[Anum_pg_aggregate_aggtranstype2 - 1] = ObjectIdGetDatum(xret2);
+		values[Anum_pg_aggregate_aggfinaltype - 1] = ObjectIdGetDatum(xret2);
 	}
 	else if (!OidIsValid(xfn2))
 	{
-		values[Anum_pg_aggregate_aggtranstype1 - 1] =
-			ObjectIdGetDatum(xret1);
-		values[Anum_pg_aggregate_aggtranstype2 - 1] =
-			ObjectIdGetDatum(InvalidOid);
-		values[Anum_pg_aggregate_aggfinaltype - 1] =
-			ObjectIdGetDatum(xret1);
+		values[Anum_pg_aggregate_aggtranstype1 - 1] = ObjectIdGetDatum(xret1);
+		values[Anum_pg_aggregate_aggtranstype2 - 1] = ObjectIdGetDatum(InvalidOid);
+		values[Anum_pg_aggregate_aggfinaltype - 1] = ObjectIdGetDatum(xret1);
 	}
 	else
 	{
-		values[Anum_pg_aggregate_aggtranstype1 - 1] =
-			ObjectIdGetDatum(xret1);
-		values[Anum_pg_aggregate_aggtranstype2 - 1] =
-			ObjectIdGetDatum(xret2);
-		values[Anum_pg_aggregate_aggfinaltype - 1] =
-			ObjectIdGetDatum(fret);
+		values[Anum_pg_aggregate_aggtranstype1 - 1] = ObjectIdGetDatum(xret1);
+		values[Anum_pg_aggregate_aggtranstype2 - 1] = ObjectIdGetDatum(xret2);
+		values[Anum_pg_aggregate_aggfinaltype - 1] = ObjectIdGetDatum(fret);
 	}
 
 	if (agginitval1)
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 40a33fd5b5..c24892946e 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.31 1998/12/15 12:45:45 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.32 1999/02/03 21:15:56 momjian Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -205,8 +205,7 @@ OperatorGet(char *operatorName,
 	 */
 	heap_close(pg_operator_desc);
 
-	return
-		operatorObjectId;
+	return operatorObjectId;
 }
 
 /* ----------------------------------------------------------------
@@ -287,8 +286,7 @@ OperatorShellMakeWithOpenRelation(Relation pg_operator_desc,
 	 */
 	pfree(tup);
 
-	return
-		operatorObjectId;
+	return operatorObjectId;
 }
 
 /* ----------------------------------------------------------------
@@ -338,8 +336,7 @@ OperatorShellMake(char *operatorName,
 	 *	and recover the shell tuple's oid.
 	 * ----------------
 	 */
-	operatorObjectId =
-		OperatorShellMakeWithOpenRelation(pg_operator_desc,
+	operatorObjectId = OperatorShellMakeWithOpenRelation(pg_operator_desc,
 										  operatorName,
 										  leftObjectId,
 										  rightObjectId);
@@ -349,8 +346,7 @@ OperatorShellMake(char *operatorName,
 	 */
 	heap_close(pg_operator_desc);
 
-	return
-		operatorObjectId;
+	return operatorObjectId;
 }
 
 /* --------------------------------
@@ -545,8 +541,7 @@ OperatorDef(char *operatorName,
 		func_error("OperatorDef", procedureName, nargs, typeId, NULL);
 
 	values[Anum_pg_operator_oprcode - 1] = ObjectIdGetDatum(tup->t_data->t_oid);
-	values[Anum_pg_operator_oprresult - 1] =
-		ObjectIdGetDatum(((Form_pg_proc)
+	values[Anum_pg_operator_oprresult - 1] = ObjectIdGetDatum(((Form_pg_proc)
 						  GETSTRUCT(tup))->prorettype);
 
 	/* ----------------
@@ -811,15 +806,13 @@ OperatorUpd(Oid baseId, Oid commId, Oid negId)
 
 				if (!OidIsValid(t->oprnegate))
 				{
-					values[Anum_pg_operator_oprnegate - 1] =
-						ObjectIdGetDatum(baseId);
+					values[Anum_pg_operator_oprnegate - 1] = ObjectIdGetDatum(baseId);
 					replaces[Anum_pg_operator_oprnegate - 1] = 'r';
 				}
 
 				if (!OidIsValid(t->oprcom))
 				{
-					values[Anum_pg_operator_oprcom - 1] =
-						ObjectIdGetDatum(baseId);
+					values[Anum_pg_operator_oprcom - 1] = ObjectIdGetDatum(baseId);
 					replaces[Anum_pg_operator_oprcom - 1] = 'r';
 				}
 
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index f67317defe..17b9574001 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.32 1998/12/15 12:45:47 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.33 1999/02/03 21:15:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -196,8 +196,7 @@ TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName)
 	/*
 	 * ... and fill typdefault with a bogus value
 	 */
-	values[i++] =
-		(Datum) fmgr(F_TEXTIN, typeName);		/* 15 */
+	values[i++] = (Datum) fmgr(F_TEXTIN, typeName);		/* 15 */
 
 	/* ----------------
 	 *	create a new type tuple with FormHeapTuple
@@ -228,8 +227,7 @@ TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName)
 	 */
 	pfree(tup);
 
-	return
-		typoid;
+	return typoid;
 }
 
 /* ----------------------------------------------------------------
@@ -271,8 +269,7 @@ TypeShellMake(char *typeName)
 	 */
 	heap_close(pg_type_desc);
 
-	return
-		typoid;
+	return typoid;
 }
 
 /* ----------------------------------------------------------------