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

src/backend/utils/adt/acl.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.31 1998/09/01 04:32:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.32 1999/02/03 21:17:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -445,16 +445,13 @@ aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg)
 	switch (modechg)
 	{
 		case ACL_MODECHG_ADD:
-			new_aip[dst].ai_mode =
-				old_aip[src].ai_mode | mod_aip->ai_mode;
+			new_aip[dst].ai_mode = old_aip[src].ai_mode | mod_aip->ai_mode;
 			break;
 		case ACL_MODECHG_DEL:
-			new_aip[dst].ai_mode =
-				old_aip[src].ai_mode & ~mod_aip->ai_mode;
+			new_aip[dst].ai_mode = old_aip[src].ai_mode & ~mod_aip->ai_mode;
 			break;
 		case ACL_MODECHG_EQL:
-			new_aip[dst].ai_mode =
-				mod_aip->ai_mode;
+			new_aip[dst].ai_mode = mod_aip->ai_mode;
 			break;
 	}
 

src/backend/utils/adt/arrayfuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.36 1999/01/17 21:12:55 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.37 1999/02/03 21:17:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -196,8 +196,7 @@ array_in(char *string,			/* input array in external form */
 	if (*p == '{')
 	{
 		/* array not a large object */
-		dataPtr =
-			(char *) _ReadArrayStr(p, nitems, ndim, dim, &inputproc, typelem,
+		dataPtr = (char *) _ReadArrayStr(p, nitems, ndim, dim, &inputproc, typelem,
 							typmod, typdelim, typlen, typbyval, typalign,
 								   &nbytes);
 		nbytes += ARR_OVERHEAD(ndim);

src/backend/utils/adt/inet_net_pton.c

@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.6 1998/10/22 13:16:26 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7 1999/02/03 21:17:27 momjian Exp $";
 
 #endif
 
@@ -113,6 +113,7 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size)
 		if (size <= 0)
 			goto emsgsize;
 		dirty = 0;
+		tmp = 0;
 		src++;	/* skip x or X. */
 		while ((ch = *src++) != '\0' && isascii(ch) && isxdigit(ch)) {
 			if (isupper(ch))

src/backend/utils/adt/regexp.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.20 1998/09/01 04:32:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.21 1999/02/03 21:17:28 momjian Exp $
  *
  *		Alistair Crooks added the code for the regex caching
  *		agc - cached the regular expressions used - there's a good chance
@@ -108,8 +108,7 @@ RE_compile_and_execute(struct varlena * text_re, char *text, int cflags)
 	{
 		for (lru = i = 0; i < rec; i++)
 		{
-			rev[i].cre_lru =
-				(rev[i].cre_lru - rev[oldest].cre_lru) / 2;
+			rev[i].cre_lru = (rev[i].cre_lru - rev[oldest].cre_lru) / 2;
 			if (rev[i].cre_lru > lru)
 				lru = rev[i].cre_lru;
 		}

src/backend/utils/cache/catcache.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.37 1999/02/02 03:44:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.38 1999/02/03 21:17:30 momjian Exp $
  *
  * Notes:
  *		XXX This needs to use exception.h to handle recovery when
@@ -210,8 +210,7 @@ CatalogCacheInitializeCache(struct catcache * cache,
 			else
 				cache->cc_klen[i] = tupdesc->attrs[cache->cc_key[i] - 1]->attlen;
 
-			cache->cc_skey[i].sk_procedure =
-				EQPROC(tupdesc->attrs[cache->cc_key[i] - 1]->atttypid);
+			cache->cc_skey[i].sk_procedure = EQPROC(tupdesc->attrs[cache->cc_key[i] - 1]->atttypid);
 
 			fmgr_info(cache->cc_skey[i].sk_procedure,
 					  &cache->cc_skey[i].sk_func);
@@ -429,8 +428,7 @@ CatalogCacheComputeTupleHashIndex(struct catcache * cacheInOutP,
 			break;
 	}
 
-	return
-		CatalogCacheComputeHashIndex(cacheInOutP);
+	return CatalogCacheComputeHashIndex(cacheInOutP);
 }
 
 /* --------------------------------

src/backend/utils/cache/fcache.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.19 1998/11/27 19:52:27 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.20 1999/02/03 21:17:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -219,8 +219,7 @@ init_fcache(Oid foid,
 			int			i;
 			List	   *oneArg;
 
-			retval->argOidVect =
-				(Oid *) palloc(retval->nargs * sizeof(Oid));
+			retval->argOidVect = (Oid *) palloc(retval->nargs * sizeof(Oid));
 			argTypes = procedureStruct->proargtypes;
 			memmove(retval->argOidVect,
 					argTypes,

src/backend/utils/cache/inval.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.19 1999/02/02 03:45:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.20 1999/02/03 21:17:32 momjian Exp $
  *
  * Note - this code is real crufty...
  *
@@ -117,7 +117,7 @@ LocalInvalidRegister(LocalInvalid invalid,
 	Assert(PointerIsValid(entry));
 
 	((InvalidationUserData *) entry)->dataP[-1] =
-		(InvalidationUserData *) invalid;
+			(InvalidationUserData *) invalid;
 
 	return entry;
 }

src/backend/utils/cache/lsyscache.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.22 1998/09/01 04:33:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.23 1999/02/03 21:17:33 momjian Exp $
  *
  * NOTES
  *	  Eventually, the index information should go through here, too.
@@ -477,8 +477,7 @@ get_typalign(Oid typid)
 struct varlena *
 get_typdefault(Oid typid)
 {
-	struct varlena *typdefault =
-	(struct varlena *) TypeDefaultRetrieve(typid);
+	struct varlena *typdefault = (struct varlena *) TypeDefaultRetrieve(typid);
 
 	return typdefault;
 }

src/backend/utils/cache/relcache.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.56 1999/02/02 03:45:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.57 1999/02/03 21:17:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -713,25 +713,20 @@ RelationBuildRuleLock(Relation relation)
 
 		rule->ruleId = pg_rewrite_tuple->t_data->t_oid;
 
-		rule->event =
-			(int) heap_getattr(pg_rewrite_tuple,
+		rule->event = (int) heap_getattr(pg_rewrite_tuple,
 							 Anum_pg_rewrite_ev_type, pg_rewrite_tupdesc,
 							   &isnull) - 48;
-		rule->attrno =
-			(int) heap_getattr(pg_rewrite_tuple,
+		rule->attrno = (int) heap_getattr(pg_rewrite_tuple,
 							 Anum_pg_rewrite_ev_attr, pg_rewrite_tupdesc,
 							   &isnull);
-		rule->isInstead =
-			!!heap_getattr(pg_rewrite_tuple,
+		rule->isInstead = !!heap_getattr(pg_rewrite_tuple,
 						   Anum_pg_rewrite_is_instead, pg_rewrite_tupdesc,
 						   &isnull);
 
-		ruleaction =
-			heap_getattr(pg_rewrite_tuple,
+		ruleaction = heap_getattr(pg_rewrite_tuple,
 						 Anum_pg_rewrite_ev_action, pg_rewrite_tupdesc,
 						 &isnull);
-		rule_evqual_string =
-			heap_getattr(pg_rewrite_tuple,
+		rule_evqual_string = heap_getattr(pg_rewrite_tuple,
 						 Anum_pg_rewrite_ev_qual, pg_rewrite_tupdesc,
 						 &isnull);
 
@@ -745,8 +740,7 @@ RelationBuildRuleLock(Relation relation)
 		if (numlocks == maxlocks)
 		{
 			maxlocks *= 2;
-			rules =
-				(RewriteRule **) repalloc(rules, sizeof(RewriteRule *) * maxlocks);
+			rules = (RewriteRule **) repalloc(rules, sizeof(RewriteRule *) * maxlocks);
 		}
 	}
 
@@ -1035,8 +1029,7 @@ formrdesc(char *relationName,
 	if (IsSystemRelationName(relationName))
 	{
 		relation->rd_rel->relowner = 6; /* XXX use sym const */
-		relation->rd_rel->relisshared =
-			IsSharedSystemRelationName(relationName);
+		relation->rd_rel->relisshared = IsSharedSystemRelationName(relationName);
 	}
 	else
 	{
@@ -1056,8 +1049,7 @@ formrdesc(char *relationName,
 	 */
 	for (i = 0; i < natts; i++)
 	{
-		relation->rd_att->attrs[i] =
-			(Form_pg_attribute) palloc(ATTRIBUTE_TUPLE_SIZE);
+		relation->rd_att->attrs[i] = (Form_pg_attribute) palloc(ATTRIBUTE_TUPLE_SIZE);
 
 		MemSet((char *) relation->rd_att->attrs[i], 0,
 			   ATTRIBUTE_TUPLE_SIZE);

src/backend/utils/cache/syscache.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.22 1998/09/01 04:33:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.23 1999/02/03 21:17:35 momjian Exp $
  *
  * NOTES
  *	  These routines allow the parser/planner/executor to perform
@@ -420,8 +420,7 @@ InitCatalogCache()
 
 			Assert(!PointerIsValid((Pointer) SysCache[cacheId]));
 
-			SysCache[cacheId] =
-				InitSysCache(cacheinfo[cacheId].name,
+			SysCache[cacheId] = InitSysCache(cacheinfo[cacheId].name,
 							 cacheinfo[cacheId].indname,
 							 cacheId,
 							 cacheinfo[cacheId].nkeys,
@@ -492,8 +491,7 @@ SearchSysCacheTuple(int cacheId,/* cache selection code */
 
 	if (!PointerIsValid(SysCache[cacheId]))
 	{
-		SysCache[cacheId] =
-			InitSysCache(cacheinfo[cacheId].name,
+		SysCache[cacheId] = InitSysCache(cacheinfo[cacheId].name,
 						 cacheinfo[cacheId].indname,
 						 cacheId,
 						 cacheinfo[cacheId].nkeys,
@@ -604,10 +602,8 @@ SearchSysCacheGetAttribute(int cacheId,
 	else if (attributeNumber > 0 &&
 			 attributeNumber <= relation->rd_rel->relnatts)
 	{
-		attributeLength =
-			relation->rd_att->attrs[attributeNumber - 1]->attlen;
-		attributeByValue =
-			relation->rd_att->attrs[attributeNumber - 1]->attbyval;
+		attributeLength = relation->rd_att->attrs[attributeNumber - 1]->attlen;
+		attributeByValue = relation->rd_att->attrs[attributeNumber - 1]->attbyval;
 	}
 	else
 	{

src/backend/utils/fmgr/fmgr.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.20 1998/09/01 04:33:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.21 1999/02/03 21:17:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -190,8 +190,7 @@ fmgr_info(Oid procedureId, FmgrInfo *finfo)
 		switch (language)
 		{
 			case INTERNALlanguageId:
-				finfo->fn_addr =
-					fmgr_lookupByName(procedureStruct->proname.data);
+				finfo->fn_addr = fmgr_lookupByName(procedureStruct->proname.data);
 				if (!finfo->fn_addr)
 					elog(ERROR, "fmgr_info: function %s: not in internal table",
 						 procedureStruct->proname.data);
@@ -342,8 +341,7 @@ fmgr_array_args(Oid procedureId, int nargs, char *args[], bool *isNull)
 	finfo.fn_nargs = nargs;
 
 	/* XXX see WAY_COOL_ORTHOGONAL_FUNCTIONS */
-	return
-		(fmgr_c(&finfo,
+	return (fmgr_c(&finfo,
 				(FmgrValues *) args,
 				isNull));
 }

src/backend/utils/hash/dynahash.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.16 1998/09/01 04:33:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.17 1999/02/03 21:17:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -329,8 +329,7 @@ init_htab(HTAB *hashp, int nelem)
 	/* allocate a directory */
 	if (!(hashp->dir))
 	{
-		hashp->dir =
-			(SEG_OFFSET *) hashp->alloc(hctl->dsize * sizeof(SEG_OFFSET));
+		hashp->dir = (SEG_OFFSET *) hashp->alloc(hctl->dsize * sizeof(SEG_OFFSET));
 		if (!hashp->dir)
 			return -1;
 	}
@@ -850,8 +849,7 @@ bucket_alloc(HTAB *hashp)
 	BUCKET_INDEX tmpIndex,
 				lastIndex;
 
-	bucketSize =
-		sizeof(BUCKET_INDEX) + hashp->hctl->keysize + hashp->hctl->datasize;
+	bucketSize = sizeof(BUCKET_INDEX) + hashp->hctl->keysize + hashp->hctl->datasize;
 
 	/* make sure its aligned correctly */
 	bucketSize += sizeof(long *) - (bucketSize % sizeof(long *));

src/backend/utils/mmgr/portalmem.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.15 1999/01/01 04:48:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.16 1999/02/03 21:17:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -883,8 +883,7 @@ StartPortalAllocMode(AllocMode mode, Size limit)
 		FixedStackPush(&context->stackData, context->block);
 
 	/* allocate and initialize new block */
-	context->block =
-		MemoryContextAlloc(
+	context->block = MemoryContextAlloc(
 			  (MemoryContext) PortalHeapMemoryGetVariableMemory(context),
 						   sizeof(HeapMemoryBlockData));
 

src/backend/utils/sort/psort.c

@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: psort.c,v 1.48 1999/02/02 03:45:12 momjian Exp $
+ *	  $Id: psort.c,v 1.49 1999/02/03 21:17:42 momjian Exp $
  *
  * NOTES
  *		Sorts the first relation into the second relation.
@@ -134,8 +134,7 @@ psort_begin(Sort *node, int nkeys, ScanKey key)
 
 	PS(node)->BytesRead = 0;
 	PS(node)->BytesWritten = 0;
-	PS(node)->treeContext.tupDesc =
-		ExecGetTupType(outerPlan((Plan *) node));
+	PS(node)->treeContext.tupDesc = ExecGetTupType(outerPlan((Plan *) node));
 	PS(node)->treeContext.nKeys = nkeys;
 	PS(node)->treeContext.scanKeys = key;
 	PS(node)->treeContext.sortMem = SortMem * 1024;
@@ -336,8 +335,7 @@ initialrun(Sort *node)
 				for (tp = PS(node)->Tape;
 					 tp - PS(node)->Tape < PS(node)->TapeRange; tp++)
 				{
-					PS(node)->TotalDummy +=
-						(tp->tp_dummy = baseruns
+					PS(node)->TotalDummy += (tp->tp_dummy = baseruns
 						 + (tp + 1)->tp_fib
 						 - tp->tp_fib);
 					tp->tp_fib = baseruns
@@ -945,10 +943,8 @@ psort_end(Sort *node)
 			else if (PS(node)->memtuples)
 				pfree(PS(node)->memtuples);
 
-			NDirectFileRead +=
-				(int) ceil((double) PS(node)->BytesRead / BLCKSZ);
-			NDirectFileWrite +=
-				(int) ceil((double) PS(node)->BytesWritten / BLCKSZ);
+			NDirectFileRead += (int) ceil((double) PS(node)->BytesRead / BLCKSZ);
+			NDirectFileWrite += (int) ceil((double) PS(node)->BytesWritten / BLCKSZ);
 
 			pfree((void *) node->psortstate);
 			node->psortstate = NULL;