pgindent run before 6.3 release, with Thomas' requested changes.

2025-11-10 17:42:29 +03:00 · 1998-02-26 04:46:47 +00:00
parent 757bf69a2e
commit a32450a585
430 changed files with 12390 additions and 10292 deletions
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.26 1998/02/25 13:07:43 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.27 1998/02/26 04:36:47 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -182,7 +182,7 @@ aclparse(char *s, AclItem *aip, unsigned *modechg)
 * RETURNS:
 *		the new Acl
 */
-Acl		   *
+Acl *
 makeacl(int n)
 {
 	Acl		   *new_acl;
@@ -240,10 +240,10 @@ aclitemin(char *s)
 * RETURNS:
 *		the new string
 */
-char	   *
+char *
 aclitemout(AclItem *aip)
 {
-	char *p;
+	char	   *p;
 	char	   *out;
 	HeapTuple	htp;
 	unsigned	i;
@@ -272,12 +272,13 @@ aclitemout(AclItem *aip)

 #ifdef NOT_USED

-	When this elog(NOTICE) goes to the libpq client, it crashes the
-	client because the NOTICE protocol is coming right in the middle
-	of a request for a field value.  We skip the NOTICE for now.
+				When this	elog(NOTICE) goes to the libpq client,
+							it crashes the
+							client because the NOTICE protocol is coming right in the middle
+							of a request for a field value.We skip the NOTICE for now.

-				elog(NOTICE, "aclitemout: usesysid %d not found",
-					 aip->ai_id);
+							elog(NOTICE, "aclitemout: usesysid %d not found",
+											 aip->ai_id);

 #endif

@@ -342,7 +343,7 @@ aclitemgt(AclItem *a1, AclItem *a2)
 			(a1->ai_idtype == a2->ai_idtype && a1->ai_id > a2->ai_id));
 }

-Acl		   *
+Acl *
 aclownerdefault(char *relname, AclId ownerid)
 {
 	Acl		   *acl;
@@ -359,7 +360,7 @@ aclownerdefault(char *relname, AclId ownerid)
 	return (acl);
 }

-Acl		   *
+Acl *
 acldefault(char *relname)
 {
 	Acl		   *acl;
@@ -373,7 +374,7 @@ acldefault(char *relname)
 	return (acl);
 }

-Acl		   *
+Acl *
 aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg)
 {
 	Acl		   *new_acl;
@@ -490,13 +491,13 @@ aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg)
 * aclinsert
 *
 */
-Acl		   *
+Acl *
 aclinsert(Acl *old_acl, AclItem *mod_aip)
 {
 	return (aclinsert3(old_acl, mod_aip, ACL_MODECHG_EQL));
 }

-Acl		   *
+Acl *
 aclremove(Acl *old_acl, AclItem *mod_aip)
 {
 	Acl		   *new_acl;
@@ -583,7 +584,7 @@ aclcontains(Acl *acl, AclItem *aip)
 *
 */

-char	   *
+char *
 aclmakepriv(char *old_privlist, char new_priv)
 {
 	char	   *priv;
@@ -636,7 +637,7 @@ aclmakepriv(char *old_privlist, char new_priv)
 *
 */

-char	   *
+char *
 aclmakeuser(char *user_type, char *user)
 {
 	char	   *user_list;
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.26 1998/02/14 18:00:37 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.27 1998/02/26 04:36:50 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -43,7 +43,8 @@

 /*-=-=--=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=--=-=-=-=-=-=-=-*/
 static int	_ArrayCount(char *str, int dim[], int typdelim);
-static char *_ReadArrayStr(char *arrayStr, int nitems, int ndim, int dim[],
+static char *
+_ReadArrayStr(char *arrayStr, int nitems, int ndim, int dim[],
 			  FmgrInfo *inputproc, Oid typelem, int16 typmod,
 			  char typdelim, int typlen, bool typbyval,
 			  char typalign, int *nbytes);
@@ -90,7 +91,7 @@ static char *array_seek(char *ptr, int eltsize, int nitems);
 *		  the internal representation of the input array
 *--------------------------------------------------------------------
 */
-char	   *
+char *
 array_in(char *string,			/* input array in external form */
 		 Oid element_type,		/* type OID of an array element */
 		 int16 typmod)
@@ -208,7 +209,7 @@ array_in(char *string,			/* input array in external form */
 		/* array not a large object */
 		dataPtr =
 			(char *) _ReadArrayStr(p, nitems, ndim, dim, &inputproc, typelem,
-								   typmod, typdelim, typlen, typbyval, typalign,
+							typmod, typdelim, typlen, typbyval, typalign,
 								   &nbytes);
 		nbytes += ARR_OVERHEAD(ndim);
 		retval = (ArrayType *) palloc(nbytes);
@@ -612,7 +613,7 @@ _CopyArrayEls(char **values,
 *		  containing the array in its external format.
 *-------------------------------------------------------------------------
 */
-char	   *
+char *
 array_out(ArrayType *v, Oid element_type)
 {
 	int			typlen;
@@ -769,7 +770,7 @@ array_out(ArrayType *v, Oid element_type)
 *		  returns the dimension of the array pointed to by "v"
 *----------------------------------------------------------------------------
 */
-char	   *
+char *
 array_dims(ArrayType *v, bool *isNull)
 {
 	char	   *p,
@@ -1071,7 +1072,7 @@ array_clip(ArrayType *array,
 *		  returns a pointer to the modified array.
 *-----------------------------------------------------------------------------
 */
-char	   *
+char *
 array_set(ArrayType *array,
 		  int n,
 		  int indx[],
@@ -1206,7 +1207,7 @@ array_set(ArrayType *array,
 *		  returns a pointer to the modified array.
 *----------------------------------------------------------------------------
 */
-char	   *
+char *
 array_assgn(ArrayType *array,
 			int n,
 			int upperIndx[],
@@ -1722,7 +1723,7 @@ _LOtransfer(char **destfd,
 #undef MAX_READ
 }

-char	   *
+char *
 _array_newLO(int *fd, int flag)
 {
 	char	   *p;
--- a/src/backend/utils/adt/bool.c
+++ b/src/backend/utils/adt/bool.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.13 1998/01/05 16:39:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.14 1998/02/26 04:36:51 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -33,9 +33,10 @@
 bool
 boolin(char *b)
 {
-	switch(*b) {
-		case 't':
-		case 'T':
+	switch (*b)
+	{
+			case 't':
+			case 'T':
 			if (strncasecmp(b, "true", strlen(b)) == 0)
 				return (TRUE);
 			break;
@@ -72,10 +73,10 @@ boolin(char *b)
 			break;
 	}

-	elog(ERROR,"Bad boolean external representation '%s'", b);
+	elog(ERROR, "Bad boolean external representation '%s'", b);
 	/* not reached */
 	return (FALSE);
-} /* boolin() */
+}	/* boolin() */

 /*
 *		boolout			- converts 1 or 0 to "t" or "f"
@@ -88,7 +89,7 @@ boolout(bool b)
 	*result = (b) ? 't' : 'f';
 	result[1] = '\0';
 	return (result);
-} /* boolout() */
+}	/* boolout() */


 /*****************************************************************************
@@ -122,11 +123,11 @@ boolgt(bool arg1, bool arg2)
 bool
 istrue(bool arg1)
 {
-	return(arg1 == TRUE);
-} /* istrue() */
+	return (arg1 == TRUE);
+}	/* istrue() */

 bool
 isfalse(bool arg1)
 {
-	return(arg1 != TRUE);
-} /* isfalse() */
+	return (arg1 != TRUE);
+}	/* isfalse() */
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -9,7 +9,7 @@
 * workings can be found in the book "Software Solutions in C" by
 * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
 *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.21 1998/01/07 18:46:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.22 1998/02/26 04:36:53 momjian Exp $
 */

 #include <stdio.h>
@@ -34,6 +34,7 @@ static const char *num_word(Cash value);

 #ifdef USE_LOCALE
 static struct lconv *lconvert = NULL;
+
 #endif

 /* cash_in()
@@ -46,7 +47,7 @@ static struct lconv *lconvert = NULL;
 *	monetary values returned by localeconv() can be multiple
 *	bytes/characters. This code assumes one byte only. - tgl 97/04/14
 */
-Cash	   *
+Cash *
 cash_in(const char *str)
 {
 	Cash	   *result;
@@ -73,7 +74,7 @@ cash_in(const char *str)

 	/* frac_digits in the C locale seems to return CHAR_MAX */
 	/* best guess is 2 in this case I think */
-	fpoint = ((lconvert->frac_digits != CHAR_MAX) ? lconvert->frac_digits : 2);		/* int_frac_digits? */
+	fpoint = ((lconvert->frac_digits != CHAR_MAX) ? lconvert->frac_digits : 2); /* int_frac_digits? */

 	dsymbol = *lconvert->mon_decimal_point;
 	ssymbol = *lconvert->mon_thousands_sep;
@@ -90,8 +91,8 @@ cash_in(const char *str)
 #endif

 #ifdef CASHDEBUG
-printf( "cashin- precision %d; decimal %c; thousands %c; currency %c; positive %c; negative %c\n",
- fpoint, dsymbol, ssymbol, csymbol, psymbol, nsymbol);
+	printf("cashin- precision %d; decimal %c; thousands %c; currency %c; positive %c; negative %c\n",
+		   fpoint, dsymbol, ssymbol, csymbol, psymbol, nsymbol);
 #endif

 	/* we need to add all sorts of checking here.  For now just */
@@ -164,7 +165,7 @@ printf( "cashin- precision %d; decimal %c; thousands %c; currency %c; positive %
 	*result = (value * sgn);

 	return (result);
-}								/* cash_in() */
+}	/* cash_in() */


 /* cash_out()
@@ -201,7 +202,7 @@ cash_out(Cash *in_value)
 	nsymbol = lconvert->negative_sign;
 	/* frac_digits in the C locale seems to return CHAR_MAX */
 	/* best guess is 2 in this case I think */
-	points = ((lconvert->frac_digits != CHAR_MAX) ? lconvert->frac_digits : 2);		/* int_frac_digits? */
+	points = ((lconvert->frac_digits != CHAR_MAX) ? lconvert->frac_digits : 2); /* int_frac_digits? */
 	convention = lconvert->n_sign_posn;
 #else
 	mon_group = 3;
@@ -276,7 +277,7 @@ cash_out(Cash *in_value)
 	}

 	return (result);
-}								/* cash_out() */
+}	/* cash_out() */


 bool
@@ -286,7 +287,7 @@ cash_eq(Cash *c1, Cash *c2)
 		return (FALSE);

 	return (*c1 == *c2);
-}								/* cash_eq() */
+}	/* cash_eq() */

 bool
 cash_ne(Cash *c1, Cash *c2)
@@ -295,7 +296,7 @@ cash_ne(Cash *c1, Cash *c2)
 		return (FALSE);

 	return (*c1 != *c2);
-}								/* cash_ne() */
+}	/* cash_ne() */

 bool
 cash_lt(Cash *c1, Cash *c2)
@@ -304,7 +305,7 @@ cash_lt(Cash *c1, Cash *c2)
 		return (FALSE);

 	return (*c1 < *c2);
-}								/* cash_lt() */
+}	/* cash_lt() */

 bool
 cash_le(Cash *c1, Cash *c2)
@@ -313,7 +314,7 @@ cash_le(Cash *c1, Cash *c2)
 		return (FALSE);

 	return (*c1 <= *c2);
-}								/* cash_le() */
+}	/* cash_le() */

 bool
 cash_gt(Cash *c1, Cash *c2)
@@ -322,7 +323,7 @@ cash_gt(Cash *c1, Cash *c2)
 		return (FALSE);

 	return (*c1 > *c2);
-}								/* cash_gt() */
+}	/* cash_gt() */

 bool
 cash_ge(Cash *c1, Cash *c2)
@@ -331,13 +332,13 @@ cash_ge(Cash *c1, Cash *c2)
 		return (FALSE);

 	return (*c1 >= *c2);
-}								/* cash_ge() */
+}	/* cash_ge() */


 /* cash_pl()
 * Add two cash values.
 */
-Cash	   *
+Cash *
 cash_pl(Cash *c1, Cash *c2)
 {
 	Cash	   *result;
@@ -351,13 +352,13 @@ cash_pl(Cash *c1, Cash *c2)
 	*result = (*c1 + *c2);

 	return (result);
-}								/* cash_pl() */
+}	/* cash_pl() */


 /* cash_mi()
 * Subtract two cash values.
 */
-Cash	   *
+Cash *
 cash_mi(Cash *c1, Cash *c2)
 {
 	Cash	   *result;
@@ -371,13 +372,13 @@ cash_mi(Cash *c1, Cash *c2)
 	*result = (*c1 - *c2);

 	return (result);
-}								/* cash_mi() */
+}	/* cash_mi() */


 /* cash_mul_flt8()
 * Multiply cash by float8.
 */
-Cash	   *
+Cash *
 cash_mul_flt8(Cash *c, float8 *f)
 {
 	Cash	   *result;
@@ -391,17 +392,17 @@ cash_mul_flt8(Cash *c, float8 *f)
 	*result = ((*f) * (*c));

 	return (result);
-}								/* cash_mul_flt8() */
+}	/* cash_mul_flt8() */


 /* flt8_mul_cash()
 * Multiply float8 by cash.
 */
-Cash	   *
+Cash *
 flt8_mul_cash(float8 *f, Cash *c)
 {
 	return (cash_mul_flt8(c, f));
-}								/* flt8_mul_cash() */
+}	/* flt8_mul_cash() */


 /* cash_div_flt8()
@@ -410,7 +411,7 @@ flt8_mul_cash(float8 *f, Cash *c)
 * XXX Don't know if rounding or truncating is correct behavior.
 * Round for now. - tgl 97/04/15
 */
-Cash	   *
+Cash *
 cash_div_flt8(Cash *c, float8 *f)
 {
 	Cash	   *result;
@@ -427,12 +428,12 @@ cash_div_flt8(Cash *c, float8 *f)
 	*result = rint(*c / *f);

 	return (result);
-}								/* cash_div_flt8() */
+}	/* cash_div_flt8() */

 /* cash_mul_flt4()
 * Multiply cash by float4.
 */
-Cash	   *
+Cash *
 cash_mul_flt4(Cash *c, float4 *f)
 {
 	Cash	   *result;
@@ -446,17 +447,17 @@ cash_mul_flt4(Cash *c, float4 *f)
 	*result = ((*f) * (*c));

 	return (result);
-}								/* cash_mul_flt4() */
+}	/* cash_mul_flt4() */


 /* flt4_mul_cash()
 * Multiply float4 by float4.
 */
-Cash	   *
+Cash *
 flt4_mul_cash(float4 *f, Cash *c)
 {
 	return (cash_mul_flt4(c, f));
-}								/* flt4_mul_cash() */
+}	/* flt4_mul_cash() */


 /* cash_div_flt4()
@@ -465,7 +466,7 @@ flt4_mul_cash(float4 *f, Cash *c)
 * XXX Don't know if rounding or truncating is correct behavior.
 * Round for now. - tgl 97/04/15
 */
-Cash	   *
+Cash *
 cash_div_flt4(Cash *c, float4 *f)
 {
 	Cash	   *result;
@@ -482,13 +483,13 @@ cash_div_flt4(Cash *c, float4 *f)
 	*result = rint(*c / *f);

 	return (result);
-}								/* cash_div_flt4() */
+}	/* cash_div_flt4() */


 /* cash_mul_int4()
 * Multiply cash by int4.
 */
-Cash	   *
+Cash *
 cash_mul_int4(Cash *c, int4 i)
 {
 	Cash	   *result;
@@ -502,17 +503,17 @@ cash_mul_int4(Cash *c, int4 i)
 	*result = ((i) * (*c));

 	return (result);
-}								/* cash_mul_int4() */
+}	/* cash_mul_int4() */


 /* int4_mul_cash()
 * Multiply int4 by cash.
 */
-Cash	   *
+Cash *
 int4_mul_cash(int4 i, Cash *c)
 {
 	return (cash_mul_int4(c, i));
-}								/* int4_mul_cash() */
+}	/* int4_mul_cash() */


 /* cash_div_int4()
@@ -521,7 +522,7 @@ int4_mul_cash(int4 i, Cash *c)
 * XXX Don't know if rounding or truncating is correct behavior.
 * Round for now. - tgl 97/04/15
 */
-Cash	   *
+Cash *
 cash_div_int4(Cash *c, int4 i)
 {
 	Cash	   *result;
@@ -538,13 +539,13 @@ cash_div_int4(Cash *c, int4 i)
 	*result = rint(*c / i);

 	return (result);
-}								/* cash_div_int4() */
+}	/* cash_div_int4() */


 /* cash_mul_int2()
 * Multiply cash by int2.
 */
-Cash	   *
+Cash *
 cash_mul_int2(Cash *c, int2 s)
 {
 	Cash	   *result;
@@ -558,17 +559,17 @@ cash_mul_int2(Cash *c, int2 s)
 	*result = ((s) * (*c));

 	return (result);
-}								/* cash_mul_int2() */
+}	/* cash_mul_int2() */


 /* int2_mul_cash()
 * Multiply int2 by cash.
 */
-Cash	   *
+Cash *
 int2_mul_cash(int2 s, Cash *c)
 {
 	return (cash_mul_int2(c, s));
-}								/* int2_mul_cash() */
+}	/* int2_mul_cash() */


 /* cash_div_int2()
@@ -577,7 +578,7 @@ int2_mul_cash(int2 s, Cash *c)
 * XXX Don't know if rounding or truncating is correct behavior.
 * Round for now. - tgl 97/04/15
 */
-Cash	   *
+Cash *
 cash_div_int2(Cash *c, int2 s)
 {
 	Cash	   *result;
@@ -594,13 +595,13 @@ cash_div_int2(Cash *c, int2 s)
 	*result = rint(*c / s);

 	return (result);
-}								/* cash_div_int2() */
+}	/* cash_div_int2() */


 /* cashlarger()
 * Return larger of two cash values.
 */
-Cash	   *
+Cash *
 cashlarger(Cash *c1, Cash *c2)
 {
 	Cash	   *result;
@@ -614,13 +615,13 @@ cashlarger(Cash *c1, Cash *c2)
 	*result = ((*c1 > *c2) ? *c1 : *c2);

 	return (result);
-}								/* cashlarger() */
+}	/* cashlarger() */


 /* cashsmaller()
 * Return smaller of two cash values.
 */
-Cash	   *
+Cash *
 cashsmaller(Cash *c1, Cash *c2)
 {
 	Cash	   *result;
@@ -634,7 +635,7 @@ cashsmaller(Cash *c1, Cash *c2)
 	*result = ((*c1 < *c2) ? *c1 : *c2);

 	return (result);
-}								/* cashsmaller() */
+}	/* cashsmaller() */


 /* cash_words_out()
@@ -691,7 +692,7 @@ cash_words_out(Cash *value)
 	strcat(buf, m0 == 1 ? " cent" : " cents");
 	*buf = toupper(*buf);
 	return (buf);
-}								/* cash_words_out() */
+}	/* cash_words_out() */


 /*************************************************************************
@@ -749,4 +750,4 @@ num_word(Cash value)
 	}

 	return (buf);
-}								/* num_word() */
+}	/* num_word() */
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -12,7 +12,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.14 1997/11/02 15:25:57 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.15 1998/02/26 04:36:54 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -40,7 +40,7 @@ charin(char *ch)
 /*
 *		charout			- converts 'x' to "x"
 */
-char	   *
+char *
 charout(int32 ch)
 {
 	char	   *result = (char *) palloc(2);
@@ -75,7 +75,7 @@ cidin(char *s)
 *		NOTE: we must no use 'charout' because cid might be a non
 *		printable character...
 */
-char	   *
+char *
 cidout(int32 c)
 {
 	char	   *result;
@@ -93,7 +93,7 @@ cidout(int32 c)
 *		Note:
 *				Currently if strlen(s) < 14, the extra chars are nulls
 */
-char	   *
+char *
 char16in(char *s)
 {
 	char	   *result;
@@ -108,7 +108,7 @@ char16in(char *s)
 /*
 *		char16out		- converts internal reprsentation to "..."
 */
-char	   *
+char *
 char16out(char *s)
 {
 	char	   *result = (char *) palloc(17);
@@ -272,7 +272,7 @@ char2in(char *s)
 	return (res);
 }

-char	   *
+char *
 char2out(uint16 s)
 {
 	char	   *result = (char *) palloc(3);
@@ -338,7 +338,7 @@ char4in(char *s)
 	return (res);
 }

-char	   *
+char *
 char4out(s)
 uint32		s;
 {
@@ -392,7 +392,7 @@ char4cmp(uint32 a, uint32 b)
 }

 /* ============================== char8 ============================== */
-char	   *
+char *
 char8in(char *s)
 {
 	char	   *result;
@@ -405,7 +405,7 @@ char8in(char *s)
 	return (result);
 }

-char	   *
+char *
 char8out(char *s)
 {
 	char	   *result = (char *) palloc(9);
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -6,7 +6,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.15 1998/02/11 19:12:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.16 1998/02/26 04:36:56 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -70,7 +70,7 @@ GetChunkSize(FILE *fd, int ndim, int dim[MAXDIM], int baseSize,
 *	   information about the chunked file
 *-----------------------------------------------------------------------
 */
-char	   *
+char *
 _ChunkArray(int fd,
 			FILE *afd,
 			int ndim,
@@ -191,7 +191,7 @@ _FindBestChunk(int size,
 		 * compute the number of page fetches for a given chunk size (d[])
 		 * and access pattern (A[][])
 		 */
-		int i,
+		int			i,
 					j,
 					nc;

@@ -224,7 +224,7 @@ _FindBestChunk(int size,
 static int
 get_next(int d[], int k, int C, int dmax[])
 {
-	int i,
+	int			i,
 				j,
 				temp;

@@ -266,7 +266,8 @@ get_next(int d[], int k, int C, int dmax[])
 }

 #ifdef LOARRAY
-static char a_chunk[BLCKSZ + VARHDRSZ];/* VARHDRSZ since a_chunk is in varlena format */
+static char a_chunk[BLCKSZ + VARHDRSZ]; /* VARHDRSZ since a_chunk is in
+										 * varlena format */

 #endif

--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.23 1998/02/11 19:12:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.24 1998/02/26 04:36:57 momjian Exp $
 *
 * NOTES
 *	 This code is actually (almost) unused.
@@ -155,13 +155,13 @@ reltimein(char *str)

 	elog(ERROR, "Bad reltime (internal coding error) '%s'", str);
 	return (INVALID_RELTIME);
-}								/* reltimein() */
+}	/* reltimein() */


 /*
 *		reltimeout		- converts the internal format to a reltime string
 */
-char	   *
+char *
 reltimeout(int32 time)
 {
 	char	   *result;
@@ -184,7 +184,7 @@ reltimeout(int32 time)
 	strcpy(result, buf);

 	return (result);
-}								/* reltimeout() */
+}	/* reltimeout() */


 #define TMODULO(t,q,u) {q = (t / u); \
@@ -201,12 +201,12 @@ reltime2tm(int32 time, struct tm * tm)
 	TMODULO(time, tm->tm_sec, 1);

 	return;
-}								/* reltime2tm() */
+}	/* reltime2tm() */

 #if FALSE
 char	   *timestring;
 long		quantity;
-int i;
+int			i;
 int			unitnr;

 timestring = (char *) palloc(Max(strlen(INVALID_RELTIME_STR),
@@ -274,7 +274,7 @@ tintervalin(char *intervalstr)
 *		tintervalout	- converts an internal interval format to a string
 *
 */
-char	   *
+char *
 tintervalout(TimeInterval interval)
 {
 	char	   *i_str,
@@ -350,7 +350,7 @@ timespan_reltime(TimeSpan *timespan)
 	}

 	return (time);
-}								/* timespan_reltime() */
+}	/* timespan_reltime() */


 TimeSpan   *
@@ -378,7 +378,7 @@ reltime_timespan(RelativeTime reltime)
 	}

 	return (result);
-}								/* reltime_timespan() */
+}	/* reltime_timespan() */


 /*
@@ -575,7 +575,7 @@ intervalsame(TimeInterval i1, TimeInterval i2)
 		return (FALSE);			/* invalid interval */
 	return (abstimeeq(i1->data[0], i2->data[0]) &&
 			abstimeeq(i1->data[1], i2->data[1]));
-} /* intervalsame() */
+}	/* intervalsame() */


 /*
@@ -585,7 +585,10 @@ intervalsame(TimeInterval i1, TimeInterval i2)
 bool
 intervaleq(TimeInterval i1, TimeInterval i2)
 {
-	AbsoluteTime t10, t11, t20, t21;
+	AbsoluteTime t10,
+				t11,
+				t20,
+				t21;

 	if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL)
 		return (FALSE);			/* invalid interval */
@@ -596,7 +599,7 @@ intervaleq(TimeInterval i1, TimeInterval i2)
 	t21 = i2->data[1];

 	if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME)
-	 || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
+		|| (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
 		return (FALSE);

 	if (t10 == CURRENT_ABSTIME)
@@ -608,8 +611,8 @@ intervaleq(TimeInterval i1, TimeInterval i2)
 	if (t21 == CURRENT_ABSTIME)
 		t21 = GetCurrentTransactionStartTime();

-	return ((t11-t10) == (t21-t20));
-} /* intervaleq() */
+	return ((t11 - t10) == (t21 - t20));
+}	/* intervaleq() */

 /*
 *		intervalne		- returns 1, iff interval i1 is not equal to interval i2
@@ -618,7 +621,10 @@ intervaleq(TimeInterval i1, TimeInterval i2)
 bool
 intervalne(TimeInterval i1, TimeInterval i2)
 {
-	AbsoluteTime t10, t11, t20, t21;
+	AbsoluteTime t10,
+				t11,
+				t20,
+				t21;

 	if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL)
 		return (FALSE);			/* invalid interval */
@@ -629,7 +635,7 @@ intervalne(TimeInterval i1, TimeInterval i2)
 	t21 = i2->data[1];

 	if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME)
-	 || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
+		|| (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
 		return (FALSE);

 	if (t10 == CURRENT_ABSTIME)
@@ -641,8 +647,8 @@ intervalne(TimeInterval i1, TimeInterval i2)
 	if (t21 == CURRENT_ABSTIME)
 		t21 = GetCurrentTransactionStartTime();

-	return ((t11-t10) != (t21-t20));
-} /* intervalne() */
+	return ((t11 - t10) != (t21 - t20));
+}	/* intervalne() */

 /*
 *		intervallt		- returns TRUE, iff interval i1 is less than interval i2
@@ -651,7 +657,10 @@ intervalne(TimeInterval i1, TimeInterval i2)
 bool
 intervallt(TimeInterval i1, TimeInterval i2)
 {
-	AbsoluteTime t10, t11, t20, t21;
+	AbsoluteTime t10,
+				t11,
+				t20,
+				t21;

 	if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL)
 		return (FALSE);			/* invalid interval */
@@ -662,7 +671,7 @@ intervallt(TimeInterval i1, TimeInterval i2)
 	t21 = i2->data[1];

 	if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME)
-	 || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
+		|| (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
 		return (FALSE);

 	if (t10 == CURRENT_ABSTIME)
@@ -674,8 +683,8 @@ intervallt(TimeInterval i1, TimeInterval i2)
 	if (t21 == CURRENT_ABSTIME)
 		t21 = GetCurrentTransactionStartTime();

-	return ((t11-t10) < (t21-t20));
-} /* intervallt() */
+	return ((t11 - t10) < (t21 - t20));
+}	/* intervallt() */

 /*
 *		intervalle		- returns TRUE, iff interval i1 is less than or equal to interval i2
@@ -684,7 +693,10 @@ intervallt(TimeInterval i1, TimeInterval i2)
 bool
 intervalle(TimeInterval i1, TimeInterval i2)
 {
-	AbsoluteTime t10, t11, t20, t21;
+	AbsoluteTime t10,
+				t11,
+				t20,
+				t21;

 	if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL)
 		return (FALSE);			/* invalid interval */
@@ -695,7 +707,7 @@ intervalle(TimeInterval i1, TimeInterval i2)
 	t21 = i2->data[1];

 	if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME)
-	 || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
+		|| (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
 		return (FALSE);

 	if (t10 == CURRENT_ABSTIME)
@@ -707,8 +719,8 @@ intervalle(TimeInterval i1, TimeInterval i2)
 	if (t21 == CURRENT_ABSTIME)
 		t21 = GetCurrentTransactionStartTime();

-	return ((t11-t10) <= (t21-t20));
-} /* intervalle() */
+	return ((t11 - t10) <= (t21 - t20));
+}	/* intervalle() */

 /*
 *		intervalgt		- returns TRUE, iff interval i1 is less than interval i2
@@ -717,7 +729,10 @@ intervalle(TimeInterval i1, TimeInterval i2)
 bool
 intervalgt(TimeInterval i1, TimeInterval i2)
 {
-	AbsoluteTime t10, t11, t20, t21;
+	AbsoluteTime t10,
+				t11,
+				t20,
+				t21;

 	if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL)
 		return (FALSE);			/* invalid interval */
@@ -728,7 +743,7 @@ intervalgt(TimeInterval i1, TimeInterval i2)
 	t21 = i2->data[1];

 	if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME)
-	 || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
+		|| (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
 		return (FALSE);

 	if (t10 == CURRENT_ABSTIME)
@@ -740,8 +755,8 @@ intervalgt(TimeInterval i1, TimeInterval i2)
 	if (t21 == CURRENT_ABSTIME)
 		t21 = GetCurrentTransactionStartTime();

-	return ((t11-t10) > (t21-t20));
-} /* intervalgt() */
+	return ((t11 - t10) > (t21 - t20));
+}	/* intervalgt() */

 /*
 *		intervalge		- returns TRUE, iff interval i1 is less than or equal to interval i2
@@ -750,7 +765,10 @@ intervalgt(TimeInterval i1, TimeInterval i2)
 bool
 intervalge(TimeInterval i1, TimeInterval i2)
 {
-	AbsoluteTime t10, t11, t20, t21;
+	AbsoluteTime t10,
+				t11,
+				t20,
+				t21;

 	if (i1->status == T_INTERVAL_INVAL || i2->status == T_INTERVAL_INVAL)
 		return (FALSE);			/* invalid interval */
@@ -761,7 +779,7 @@ intervalge(TimeInterval i1, TimeInterval i2)
 	t21 = i2->data[1];

 	if ((t10 == INVALID_ABSTIME) || (t20 == INVALID_ABSTIME)
-	 || (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
+		|| (t20 == INVALID_ABSTIME) || (t21 == INVALID_ABSTIME))
 		return (FALSE);

 	if (t10 == CURRENT_ABSTIME)
@@ -773,8 +791,8 @@ intervalge(TimeInterval i1, TimeInterval i2)
 	if (t21 == CURRENT_ABSTIME)
 		t21 = GetCurrentTransactionStartTime();

-	return ((t11-t10) >= (t21-t20));
-} /* intervalge() */
+	return ((t11 - t10) >= (t21 - t20));
+}	/* intervalge() */


 /*
@@ -963,11 +981,11 @@ isreltime(char *str)
 	}

 	return 0;
-}								/* isreltime() */
+}	/* isreltime() */

 #if FALSE
-char *p;
-char c;
+char	   *p;
+char		c;
 int			i;
 char		unit[UNITMAXLEN];
 char		direction[DIRMAXLEN];
@@ -1156,9 +1174,9 @@ istinterval(char *i_string,
 			AbsoluteTime *i_start,
 			AbsoluteTime *i_end)
 {
-	char *p,
+	char	   *p,
 			   *p1;
-	char c;
+	char		c;

 	p = i_string;
 	/* skip leading blanks up to '[' */
@@ -1259,7 +1277,7 @@ istinterval(char *i_string,
 *	   the Wisconsin benchmark with Illustra whose TimeNow() shows current
 *	   time with precision up to microsecs.)			  - ay 3/95
 */
-text	   *
+text *
 timeofday(void)
 {

--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.21 1998/01/07 18:46:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.22 1998/02/26 04:36:59 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -110,7 +110,7 @@ date_in(char *str)
 	date = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(2000, 1, 1));

 	return (date);
-} /* date_in() */
+}	/* date_in() */

 /* date_out()
 * Given internal format date, convert to text string.
@@ -133,7 +133,7 @@ date_out(DateADT date)
 	strcpy(result, buf);

 	return (result);
-} /* date_out() */
+}	/* date_out() */

 bool
 date_eq(DateADT dateVal1, DateADT dateVal2)
@@ -151,25 +151,25 @@ bool
 date_lt(DateADT dateVal1, DateADT dateVal2)
 {
 	return (dateVal1 < dateVal2);
-} /* date_lt() */
+}	/* date_lt() */

 bool
 date_le(DateADT dateVal1, DateADT dateVal2)
 {
 	return (dateVal1 <= dateVal2);
-} /* date_le() */
+}	/* date_le() */

 bool
 date_gt(DateADT dateVal1, DateADT dateVal2)
 {
 	return (dateVal1 > dateVal2);
-} /* date_gt() */
+}	/* date_gt() */

 bool
 date_ge(DateADT dateVal1, DateADT dateVal2)
 {
 	return (dateVal1 >= dateVal2);
-} /* date_ge() */
+}	/* date_ge() */

 int
 date_cmp(DateADT dateVal1, DateADT dateVal2)
@@ -183,19 +183,19 @@ date_cmp(DateADT dateVal1, DateADT dateVal2)
 		return 1;
 	}
 	return 0;
-} /* date_cmp() */
+}	/* date_cmp() */

 DateADT
 date_larger(DateADT dateVal1, DateADT dateVal2)
 {
 	return (date_gt(dateVal1, dateVal2) ? dateVal1 : dateVal2);
-} /* date_larger() */
+}	/* date_larger() */

 DateADT
 date_smaller(DateADT dateVal1, DateADT dateVal2)
 {
 	return (date_lt(dateVal1, dateVal2) ? dateVal1 : dateVal2);
-} /* date_smaller() */
+}	/* date_smaller() */

 /* Compute difference between two dates in days.
 */
@@ -203,7 +203,7 @@ int4
 date_mi(DateADT dateVal1, DateADT dateVal2)
 {
 	return (dateVal1 - dateVal2);
-} /* date_mi() */
+}	/* date_mi() */

 /* Add a number of days to a date, giving a new date.
 * Must handle both positive and negative numbers of days.
@@ -212,7 +212,7 @@ DateADT
 date_pli(DateADT dateVal, int4 days)
 {
 	return (dateVal + days);
-} /* date_pli() */
+}	/* date_pli() */

 /* Subtract a number of days from a date, giving a new date.
 */
@@ -220,13 +220,13 @@ DateADT
 date_mii(DateADT dateVal, int4 days)
 {
 	return (date_pli(dateVal, -days));
-} /* date_mii() */
+}	/* date_mii() */


 /* date_datetime()
 * Convert date to datetime data type.
 */
-DateTime *
+DateTime   *
 date_datetime(DateADT dateVal)
 {
 	DateTime   *result;
@@ -250,7 +250,7 @@ date_datetime(DateADT dateVal)
 		elog(ERROR, "Datetime out of range", NULL);

 	return (result);
-} /* date_datetime() */
+}	/* date_datetime() */


 /* datetime_date()
@@ -291,7 +291,7 @@ datetime_date(DateTime *datetime)
 	result = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(2000, 1, 1));

 	return (result);
-} /* datetime_date() */
+}	/* datetime_date() */


 /* abstime_date()
@@ -333,7 +333,7 @@ abstime_date(AbsoluteTime abstime)
 	}

 	return (result);
-} /* abstime_date() */
+}	/* abstime_date() */


 /* date2tm()
@@ -416,7 +416,7 @@ date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn)
 	}

 	return 0;
-} /* date2tm() */
+}	/* date2tm() */


 /*****************************************************************************
@@ -424,7 +424,7 @@ date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn)
 *****************************************************************************/


-TimeADT *
+TimeADT    *
 time_in(char *str)
 {
 	TimeADT    *time;
@@ -458,7 +458,7 @@ time_in(char *str)
 	*time = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec);

 	return (time);
-} /* time_in() */
+}	/* time_in() */


 char *
@@ -487,7 +487,7 @@ time_out(TimeADT *time)
 	strcpy(result, buf);

 	return (result);
-} /* time_out() */
+}	/* time_out() */


 bool
@@ -497,7 +497,7 @@ time_eq(TimeADT *time1, TimeADT *time2)
 		return (FALSE);

 	return (*time1 == *time2);
-} /* time_eq() */
+}	/* time_eq() */

 bool
 time_ne(TimeADT *time1, TimeADT *time2)
@@ -506,7 +506,7 @@ time_ne(TimeADT *time1, TimeADT *time2)
 		return (FALSE);

 	return (*time1 != *time2);
-} /* time_eq() */
+}	/* time_eq() */

 bool
 time_lt(TimeADT *time1, TimeADT *time2)
@@ -515,7 +515,7 @@ time_lt(TimeADT *time1, TimeADT *time2)
 		return (FALSE);

 	return (*time1 < *time2);
-} /* time_eq() */
+}	/* time_eq() */

 bool
 time_le(TimeADT *time1, TimeADT *time2)
@@ -524,7 +524,7 @@ time_le(TimeADT *time1, TimeADT *time2)
 		return (FALSE);

 	return (*time1 <= *time2);
-} /* time_eq() */
+}	/* time_eq() */

 bool
 time_gt(TimeADT *time1, TimeADT *time2)
@@ -533,7 +533,7 @@ time_gt(TimeADT *time1, TimeADT *time2)
 		return (FALSE);

 	return (*time1 > *time2);
-} /* time_eq() */
+}	/* time_eq() */

 bool
 time_ge(TimeADT *time1, TimeADT *time2)
@@ -542,22 +542,22 @@ time_ge(TimeADT *time1, TimeADT *time2)
 		return (FALSE);

 	return (*time1 >= *time2);
-} /* time_eq() */
+}	/* time_eq() */

 int
 time_cmp(TimeADT *time1, TimeADT *time2)
 {
 	return ((*time1 < *time2) ? -1 : (((*time1 > *time2) ? 1 : 0)));
-} /* time_cmp() */
+}	/* time_cmp() */


 /* datetime_time()
 * Convert datetime to time data type.
 */
-TimeADT *
+TimeADT    *
 datetime_time(DateTime *datetime)
 {
-	TimeADT		*result;
+	TimeADT    *result;
 	struct tm	tt,
 			   *tm = &tt;
 	int			tz;
@@ -591,13 +591,13 @@ datetime_time(DateTime *datetime)
 	*result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec);

 	return (result);
-} /* datetime_time() */
+}	/* datetime_time() */


 /* datetime_datetime()
 * Convert date and time to datetime data type.
 */
-DateTime *
+DateTime   *
 datetime_datetime(DateADT date, TimeADT *time)
 {
 	DateTime   *result;
@@ -606,13 +606,15 @@ datetime_datetime(DateADT date, TimeADT *time)
 	{
 		result = palloc(sizeof(DateTime));
 		DATETIME_INVALID(*result);
-	} else {
+	}
+	else
+	{
 		result = date_datetime(date);
 		*result += *time;
 	}

 	return (result);
-} /* datetime_datetime() */
+}	/* datetime_datetime() */


 int32							/* RelativeTime */
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
--- a/src/backend/utils/adt/filename.c
+++ b/src/backend/utils/adt/filename.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.13 1998/01/05 16:39:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.14 1998/02/26 04:37:03 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -22,7 +22,7 @@
 #include <miscadmin.h>
 #include "utils/builtins.h"		/* where function declarations go */

-char	   *
+char *
 filename_in(char *file)
 {
 	char	   *str;
@@ -72,7 +72,7 @@ filename_in(char *file)
 			else
 			{
 				len = (p - file) - 1;
-				StrNCpy(name, file + 1, len+1);
+				StrNCpy(name, file + 1, len + 1);
 			}
 			/* printf("name: %s\n"); */
 			if ((pw = getpwnam(name)) == NULL)
@@ -102,7 +102,7 @@ filename_in(char *file)
 		else
 		{
 			len = (p - file) - 1;
-			StrNCpy(environment, file + 1, len+1);
+			StrNCpy(environment, file + 1, len + 1);
 		}
 		envirp = getenv(environment);
 		if (envirp)
@@ -123,7 +123,7 @@ filename_in(char *file)
 	return (str);
 }

-char	   *
+char *
 filename_out(char *s)
 {
 	char	   *ret;
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.28 1998/02/02 00:03:54 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.29 1998/02/26 04:37:07 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -220,7 +220,7 @@ float4in(char *num)
 *		float4out		- converts a float4 number to a string
 *						  using a standard output format
 */
-char	   *
+char *
 float4out(float32 num)
 {
 	char	   *ascii = (char *) palloc(MAXFLOATWIDTH + 1);
@@ -262,7 +262,7 @@ float8in(char *num)
 *		float8out		- converts float8 number to a string
 *						  using a standard output format
 */
-char	   *
+char *
 float8out(float64 num)
 {
 	char	   *ascii = (char *) palloc(MAXDOUBLEWIDTH + 1);
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.14 1998/02/11 19:12:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.15 1998/02/26 04:37:10 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -80,7 +80,7 @@ int2out(int16 sh)
 int16 *
 int28in(char *shs)
 {
-	int16 (*result)[];
+	int16		(*result)[];
 	int			nums;

 	if (shs == NULL)
@@ -109,9 +109,9 @@ int28in(char *shs)
 char *
 int28out(int16 (*shs)[])
 {
-	int num;
-	int16 *sp;
-	char *rp;
+	int			num;
+	int16	   *sp;
+	char	   *rp;
 	char	   *result;

 	if (shs == NULL)
@@ -145,7 +145,7 @@ int32 *
 int44in(char *input_string)
 {
 	int32	   *foo = (int32 *) palloc(4 * sizeof(int32));
-	int i = 0;
+	int			i = 0;

 	i = sscanf(input_string,
 			   "%d, %d, %d, %d",
@@ -242,10 +242,10 @@ i4toi2(int32 arg1)
 text *
 int2_text(int16 arg1)
 {
-	text *result;
+	text	   *result;

-	int len;
-	char *str;
+	int			len;
+	char	   *str;

 	str = int2out(arg1);
 	len = (strlen(str) + VARHDRSZ);
@@ -257,36 +257,36 @@ int2_text(int16 arg1)

 	pfree(str);

-	return(result);
-} /* int2_text() */
+	return (result);
+}	/* int2_text() */

 int16
 text_int2(text *string)
 {
-	int16 result;
+	int16		result;

-	int len;
-	char *str;
+	int			len;
+	char	   *str;

 	len = (VARSIZE(string) - VARHDRSZ);

-	str = palloc(len+1);
+	str = palloc(len + 1);
 	memmove(str, VARDATA(string), len);
-	*(str+len) = '\0';
+	*(str + len) = '\0';

 	result = int2in(str);
 	pfree(str);
- 
-	return(result);
-} /* text_int2() */
+
+	return (result);
+}	/* text_int2() */

 text *
 int4_text(int32 arg1)
 {
-	text *result;
+	text	   *result;

-	int len;
-	char *str;
+	int			len;
+	char	   *str;

 	str = int4out(arg1);
 	len = (strlen(str) + VARHDRSZ);
@@ -298,28 +298,28 @@ int4_text(int32 arg1)

 	pfree(str);

-	return(result);
-} /* int4_text() */
+	return (result);
+}	/* int4_text() */

 int32
 text_int4(text *string)
 {
-	int32 result;
+	int32		result;

-	int len;
-	char *str;
+	int			len;
+	char	   *str;

 	len = (VARSIZE(string) - VARHDRSZ);

-	str = palloc(len+1);
+	str = palloc(len + 1);
 	memmove(str, VARDATA(string), len);
-	*(str+len) = '\0';
+	*(str + len) = '\0';

 	result = int4in(str);
 	pfree(str);
- 
-	return(result);
-} /* text_int4() */
+
+	return (result);
+}	/* text_int4() */


 /*
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -48,7 +48,7 @@ fixedlen_like(char *s, struct varlena * p, int charlen)

 	/* be sure sterm is null-terminated */
 	sterm = (char *) palloc(charlen + 1);
-	StrNCpy(sterm, s, charlen+1);
+	StrNCpy(sterm, s, charlen + 1);

 	/*
 	 * p is a text = varlena, not a string so we have to make a string
@@ -150,7 +150,7 @@ textnlike(struct varlena * s, struct varlena * p)
 }


-/*	$Revision: 1.11 $
+/*	$Revision: 1.12 $
 **	"like.c" A first attempt at a LIKE operator for Postgres95.
 **
 **	Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
@@ -187,7 +187,7 @@ textnlike(struct varlena * s, struct varlena * p)
 static int
 DoMatch(char *text, char *p)
 {
-	int matched;
+	int			matched;

 	for (; *p; text ++, p++)
 	{
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.41 1998/02/02 01:28:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.42 1998/02/26 04:37:12 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -103,7 +103,7 @@ GetCurrentAbsoluteTime(void)
 #endif

 	return ((AbsoluteTime) now);
-}								/* GetCurrentAbsoluteTime() */
+}	/* GetCurrentAbsoluteTime() */


 void
@@ -114,7 +114,7 @@ GetCurrentTime(struct tm * tm)
 	abstime2tm(GetCurrentTransactionStartTime(), &tz, tm, NULL);

 	return;
-}								/* GetCurrentTime() */
+}	/* GetCurrentTime() */


 void
@@ -190,7 +190,7 @@ abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn)
 #endif

 	return;
-}								/* abstime2tm() */
+}	/* abstime2tm() */


 /* tm2abstime()
@@ -231,7 +231,7 @@ tm2abstime(struct tm * tm, int tz)
 		return (INVALID_ABSTIME);

 	return (sec);
-}								/* tm2abstime() */
+}	/* tm2abstime() */


 /* nabstimein()
@@ -300,13 +300,13 @@ nabstimein(char *str)
 	};

 	return result;
-}								/* nabstimein() */
+}	/* nabstimein() */


 /* nabstimeout()
 * Given an AbsoluteTime return the English text version of the date
 */
-char	   *
+char *
 nabstimeout(AbsoluteTime time)
 {
 	char	   *result;
@@ -347,7 +347,7 @@ nabstimeout(AbsoluteTime time)
 	strcpy(result, buf);

 	return (result);
-}								/* nabstimeout() */
+}	/* nabstimeout() */


 /*
@@ -392,7 +392,7 @@ abstime_finite(AbsoluteTime abstime)
 {
 	return ((abstime != INVALID_ABSTIME)
 		  && (abstime != NOSTART_ABSTIME) && (abstime != NOEND_ABSTIME));
-} /* abstime_finite() */
+}	/* abstime_finite() */


 /*
@@ -534,7 +534,7 @@ datetime_abstime(DateTime *datetime)
 	};

 	return (result);
-} /* datetime_abstime() */
+}	/* datetime_abstime() */

 /* abstime_datetime()
 * Convert abstime to datetime.
@@ -575,4 +575,4 @@ abstime_datetime(AbsoluteTime abstime)
 	};

 	return (result);
-} /* abstime_datetime() */
+}	/* abstime_datetime() */
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,7 +11,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.10 1997/10/25 01:10:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.11 1998/02/26 04:37:13 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -48,7 +48,7 @@ namein(char *s)
 /*
 *		nameout - converts internal reprsentation to "..."
 */
-char	   *
+char *
 nameout(NameData *s)
 {
 	if (s == NULL)
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.22 1998/02/11 19:12:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.23 1998/02/26 04:37:14 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -184,9 +184,9 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
 #else
 	auto int	expon;
 	auto int	sign;
-	int avail = 0;
-	char *a = NULL;
-	char *p = NULL;
+	int			avail = 0;
+	char	   *a = NULL;
+	char	   *p = NULL;
 	char		mode;
 	int			lowercase;
 	int			prec;
@@ -333,7 +333,7 @@ frac_out:
 	*a = 0;
 	avail = a - ascii;
 	return (avail);
-#endif	
+#endif
 }

 #endif
@@ -370,13 +370,13 @@ frac_out:
 int
 atof1(char *str, double *val)
 {
-	char *p;
+	char	   *p;
 	double		v;
 	double		fact;
 	int			minus;
-	char c;
+	char		c;
 	int			expon;
-	int gotmant;
+	int			gotmant;

 	v = 0.0;
 	p = str;
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.14 1998/02/11 19:12:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.15 1998/02/26 04:37:16 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -28,10 +28,10 @@
 *		Note:
 *				Fills any nonexistent digits with NULL oids.
 */
-Oid	*
+Oid *
 oid8in(char *oidString)
 {
-	Oid (*result)[];
+	Oid			(*result)[];
 	int			nums;

 	if (oidString == NULL)
@@ -60,9 +60,9 @@ oid8in(char *oidString)
 char *
 oid8out(Oid (*oidArray)[])
 {
-	int num;
-	Oid *sp;
-	char *rp;
+	int			num;
+	Oid		   *sp;
+	char	   *rp;
 	char	   *result;

 	if (oidArray == NULL)
@@ -142,10 +142,10 @@ int4eqoid(int32 arg1, Oid arg2)
 text *
 oid_text(Oid oid)
 {
-	text *result;
+	text	   *result;

-	int	len;
-	char *str;
+	int			len;
+	char	   *str;

 	str = oidout(oid);
 	len = (strlen(str) + VARHDRSZ);
@@ -153,28 +153,28 @@ oid_text(Oid oid)
 	result = palloc(len);

 	VARSIZE(result) = len;
-	memmove(VARDATA(result), str, (len-VARHDRSZ));
+	memmove(VARDATA(result), str, (len - VARHDRSZ));
 	pfree(str);

-	return(result);
-} /* oid_text() */
+	return (result);
+}	/* oid_text() */

 Oid
 text_oid(text *string)
 {
-	Oid result;
+	Oid			result;

-	int	len;
-	char *str;
+	int			len;
+	char	   *str;

-    len = (VARSIZE(string) - VARHDRSZ);
+	len = (VARSIZE(string) - VARHDRSZ);

-	str = palloc(len+1);
+	str = palloc(len + 1);
 	memmove(str, VARDATA(string), len);
-	*(str+len) = '\0';
+	*(str + len) = '\0';

 	result = oidin(str);
 	pfree(str);

-	return(result);
-} /* oid_text() */
+	return (result);
+}	/* oid_text() */
--- a/src/backend/utils/adt/oidint2.c
+++ b/src/backend/utils/adt/oidint2.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidint2.c,v 1.4 1997/09/08 21:48:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidint2.c,v 1.5 1998/02/26 04:37:17 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -42,7 +42,7 @@ oidint2in(char *o)
 	return (oi);
 }

-char	   *
+char *
 oidint2out(OidInt2 o)
 {
 	char	   *r;
--- a/src/backend/utils/adt/oidint4.c
+++ b/src/backend/utils/adt/oidint4.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidint4.c,v 1.4 1997/09/08 21:48:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidint4.c,v 1.5 1998/02/26 04:37:17 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -41,7 +41,7 @@ oidint4in(char *o)
 	return (oi);
 }

-char	   *
+char *
 oidint4out(OidInt4 o)
 {
 	char	   *r;
--- a/src/backend/utils/adt/oidname.c
+++ b/src/backend/utils/adt/oidname.c
@@ -8,7 +8,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.11 1998/01/05 16:40:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.12 1998/02/26 04:37:18 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -45,7 +45,7 @@ oidnamein(char *inStr)
 	return oc;
 }

-char	   *
+char *
 oidnameout(OidName oidname)
 {
 	char		buf[30 + NAMEDATALEN];	/* oidname length + oid length +
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -1,7 +1,7 @@
 /*
 *	Edmund Mergl <E.Mergl@bawue.de>
 *
- *	$Id: oracle_compat.c,v 1.11 1998/01/13 03:49:51 scrappy Exp $
+ *	$Id: oracle_compat.c,v 1.12 1998/02/26 04:37:19 momjian Exp $
 *
 */

@@ -36,7 +36,7 @@ text	   *translate(text *string, char from, char to);
 *
 ********************************************************************/

-text	   *
+text *
 lower(text *string)
 {
 	text	   *ret;
@@ -76,7 +76,7 @@ lower(text *string)
 *
 ********************************************************************/

-text	   *
+text *
 upper(text *string)
 {
 	text	   *ret;
@@ -118,7 +118,7 @@ upper(text *string)
 *
 ********************************************************************/

-text	   *
+text *
 initcap(text *string)
 {
 	text	   *ret;
@@ -169,7 +169,7 @@ initcap(text *string)
 *
 ********************************************************************/

-text	   *
+text *
 lpad(text *string1, int4 len, text *string2)
 {
 	text	   *ret;
@@ -225,7 +225,7 @@ lpad(text *string1, int4 len, text *string2)
 *
 ********************************************************************/

-text	   *
+text *
 rpad(text *string1, int4 len, text *string2)
 {
 	text	   *ret;
@@ -281,7 +281,7 @@ rpad(text *string1, int4 len, text *string2)
 *
 ********************************************************************/

-text	   *
+text *
 btrim(text *string, text *set)
 {
 	text	   *ret;
@@ -349,7 +349,7 @@ btrim(text *string, text *set)
 	memcpy(VARDATA(ret), ptr, m);

 	return ret;
-}								/* btrim() */
+}	/* btrim() */


 /********************************************************************
@@ -367,7 +367,7 @@ btrim(text *string, text *set)
 *
 ********************************************************************/

-text	   *
+text *
 ltrim(text *string, text *set)
 {
 	text	   *ret;
@@ -430,7 +430,7 @@ ltrim(text *string, text *set)
 *
 ********************************************************************/

-text	   *
+text *
 rtrim(text *string, text *set)
 {
 	text	   *ret;
@@ -502,7 +502,7 @@ rtrim(text *string, text *set)
 *
 ********************************************************************/

-text	   *
+text *
 substr(text *string, int4 m, int4 n)
 {
 	text	   *ret;
@@ -548,7 +548,7 @@ substr(text *string, int4 m, int4 n)
 *
 ********************************************************************/

-text	   *
+text *
 translate(text *string, char from, char to)
 {
 	text	   *ret;
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.13 1998/01/05 16:40:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.14 1998/02/26 04:37:20 momjian Exp $
 *
 *		Alistair Crooks added the code for the regex caching
 *		agc - cached the regular expressions used - there's a good chance
@@ -189,7 +189,7 @@ fixedlen_regexeq(char *s, struct varlena * p, int charlen, int cflags)

 	/* be sure sterm is null-terminated */
 	sterm = (char *) palloc(charlen + 1);
-	StrNCpy(sterm, s, charlen+1);
+	StrNCpy(sterm, s, charlen + 1);

 	result = RE_compile_and_execute(p, sterm, cflags);

--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.14 1998/02/11 19:12:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.15 1998/02/26 04:37:20 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -90,7 +90,7 @@ regprocin(char *proname)
 /*
 *		regprocout		- converts proid to "proname"
 */
-char	   *
+char *
 regprocout(RegProcedure proid)
 {
 	Relation	proc;
@@ -152,7 +152,7 @@ regprocout(RegProcedure proid)
 /*
 *		int8typeout			- converts int8 type oids to "typname" list
 */
-text	   *
+text *
 oid8types(Oid (*oidArray)[])
 {
 	Relation	type;
@@ -160,18 +160,18 @@ oid8types(Oid (*oidArray)[])
 	HeapTuple	typetup;
 	text	   *result;
 	ScanKeyData key;
-	int num;
-	Oid *sp;
+	int			num;
+	Oid		   *sp;

 	if (oidArray == NULL)
 	{
-	 	result = (text *) palloc(VARHDRSZ);
+		result = (text *) palloc(VARHDRSZ);
 		VARSIZE(result) = 0;
 		return (result);
 	}

- 	result = (text *) palloc(NAMEDATALEN * 8 + 8 + VARHDRSZ);
- 	*VARDATA(result) = '\0';
+	result = (text *) palloc(NAMEDATALEN * 8 + 8 + VARHDRSZ);
+	*VARDATA(result) = '\0';
 	type = heap_openr(TypeRelationName);
 	if (!RelationIsValid(type))
 	{
@@ -190,7 +190,7 @@ oid8types(Oid (*oidArray)[])
 								   (AttrNumber) ObjectIdAttributeNumber,
 								   (RegProcedure) F_INT4EQ,
 								   (Datum) *sp);
-		
+
 			typescan = heap_beginscan(type, 0, false, 1, &key);
 			if (!HeapScanIsValid(typescan))
 			{
@@ -204,17 +204,17 @@ oid8types(Oid (*oidArray)[])
 			{
 				char	   *s;
 				bool		isnull;
-	
+
 				s = (char *) heap_getattr(typetup, 1,
-								  RelationGetTupleDescriptor(type), &isnull);
+							  RelationGetTupleDescriptor(type), &isnull);
 				if (!isnull)
 				{
-					StrNCpy(VARDATA(result)+strlen(VARDATA(result)),s,16);
-					strcat(VARDATA(result)," ");
+					StrNCpy(VARDATA(result) + strlen(VARDATA(result)), s, 16);
+					strcat(VARDATA(result), " ");
 				}
 				else
 					elog(FATAL, "int8typeout: null procedure %d", *sp);
-					/* FALLTHROUGH */
+				/* FALLTHROUGH */
 			}
 			heap_endscan(typescan);
 		}
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -12,7 +12,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.17 1998/02/11 19:12:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.18 1998/02/26 04:37:21 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -334,7 +334,7 @@ gethilokey(Oid relid,
 		   char **high,
 		   char **low)
 {
-	Relation rdesc;
+	Relation	rdesc;
 	HeapScanDesc sdesc;
 	static ScanKeyData key[3] = {
 		{0, Anum_pg_statistic_starelid, F_OIDEQ, {0, 0, F_OIDEQ}},
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.4 1997/09/08 02:31:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.5 1998/02/26 04:37:22 momjian Exp $
 *
 * NOTES
 *	  input routine largely stolen from boxin().
@@ -67,7 +67,7 @@ tidin(char *str)
 *		tidout
 * ----------------------------------------------------------------
 */
-char	   *
+char *
 tidout(ItemPointer itemPtr)
 {
 	BlockNumber blockNumber;
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -51,11 +51,11 @@ timestamp_out(time_t timestamp)
 			EncodeDateTime(tm, fsec, &tz, &tzn, USE_ISO_DATES, buf);
 			break;
 	}
- 
+
 	result = palloc(strlen(buf) + 1);
 	strcpy(result, buf);
 	return result;
-} /* timestamp_out() */
+}	/* timestamp_out() */

 time_t
 now(void)
@@ -69,47 +69,47 @@ now(void)
 bool
 timestampeq(time_t t1, time_t t2)
 {
-	return(abstimeeq(t1,t2));
+	return (abstimeeq(t1, t2));
 }

 bool
 timestampne(time_t t1, time_t t2)
 {
-	return(abstimene(t1,t2));
+	return (abstimene(t1, t2));
 }

 bool
 timestamplt(time_t t1, time_t t2)
 {
-	return(abstimelt(t1,t2));
+	return (abstimelt(t1, t2));
 }

 bool
 timestampgt(time_t t1, time_t t2)
 {
-	return(abstimegt(t1,t2));
+	return (abstimegt(t1, t2));
 }

 bool
 timestample(time_t t1, time_t t2)
 {
-	return(abstimele(t1,t2));
+	return (abstimele(t1, t2));
 }

 bool
 timestampge(time_t t1, time_t t2)
 {
-	return(abstimege(t1,t2));
+	return (abstimege(t1, t2));
 }

-DateTime *
+DateTime   *
 timestamp_datetime(time_t timestamp)
 {
-	return(abstime_datetime((AbsoluteTime) timestamp));
-} /* timestamp_datetime() */
+	return (abstime_datetime((AbsoluteTime) timestamp));
+}	/* timestamp_datetime() */

 time_t
 datetime_timestamp(DateTime *datetime)
 {
-	return((AbsoluteTime) datetime_abstime(datetime));
-} /* datetime_timestamp() */
+	return ((AbsoluteTime) datetime_abstime(datetime));
+}	/* datetime_timestamp() */
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.28 1998/02/24 15:19:44 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.29 1998/02/26 04:37:24 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -17,7 +17,8 @@
 #include "utils/builtins.h"

 #ifdef CYR_RECODE
-char *convertstr(char *,int,int);
+char	   *convertstr(char *, int, int);
+
 #endif

 /*
@@ -90,7 +91,7 @@ bpcharin(char *s, int dummy, int16 atttypmod)
 	}

 #ifdef CYR_RECODE
-	convertstr(result + VARHDRSZ,len,0);
+	convertstr(result + VARHDRSZ, len, 0);
 #endif

 	/* blank pad the string if necessary */
@@ -117,11 +118,11 @@ bpcharout(char *s)
 	{
 		len = VARSIZE(s) - VARHDRSZ;
 		result = (char *) palloc(len + 1);
-		StrNCpy(result, VARDATA(s), len+1);	/* these are blank-padded */
+		StrNCpy(result, VARDATA(s), len + 1);	/* these are blank-padded */
 	}

 #ifdef CYR_RECODE
-	convertstr(result,len,1);
+	convertstr(result, len, 1);
 #endif

 	return (result);
@@ -148,7 +149,7 @@ varcharin(char *s, int dummy, int16 atttypmod)

 	len = strlen(s) + VARHDRSZ;
 	if (atttypmod != -1 && len > atttypmod)
-		len = atttypmod;	/* clip the string at max length */
+		len = atttypmod;		/* clip the string at max length */

 	if (len > 4096)
 		elog(ERROR, "varcharin: length of char() must be less than 4096");
@@ -158,7 +159,7 @@ varcharin(char *s, int dummy, int16 atttypmod)
 	strncpy(VARDATA(result), s, len - VARHDRSZ);

 #ifdef CYR_RECODE
-	convertstr(result + VARHDRSZ,len,0);
+	convertstr(result + VARHDRSZ, len, 0);
 #endif

 	return (result);
@@ -180,11 +181,11 @@ varcharout(char *s)
 	{
 		len = VARSIZE(s) - VARHDRSZ;
 		result = (char *) palloc(len + 1);
-		StrNCpy(result, VARDATA(s), len+1);
+		StrNCpy(result, VARDATA(s), len + 1);
 	}

 #ifdef CYR_RECODE
-	convertstr(result,len,1);
+	convertstr(result, len, 1);
 #endif

 	return (result);
@@ -216,7 +217,7 @@ bpcharlen(char *arg)
 	if (!PointerIsValid(arg))
 		elog(ERROR, "Bad (null) char() external representation", NULL);

-	return(bcTruelen(arg));
+	return (bcTruelen(arg));
 }

 bool
@@ -356,7 +357,7 @@ varcharlen(char *arg)
 	if (!PointerIsValid(arg))
 		elog(ERROR, "Bad (null) varchar() external representation", NULL);

-	return(VARSIZE(arg) - VARHDRSZ);
+	return (VARSIZE(arg) - VARHDRSZ);
 }

 bool
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -7,7 +7,7 @@
 *
 *
 * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.30 1998/02/24 15:19:45 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.31 1998/02/26 04:37:24 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -159,7 +159,7 @@ textin(char *inputText)
 	memmove(VARDATA(result), inputText, len - VARHDRSZ);

 #ifdef CYR_RECODE
-	convertstr(VARDATA(result),len-VARHDRSZ,0);
+	convertstr(VARDATA(result), len - VARHDRSZ, 0);
 #endif

 	return (result);
@@ -187,7 +187,7 @@ textout(text *vlena)
 	result[len] = '\0';

 #ifdef CYR_RECODE
-	convertstr(result,len,1);
+	convertstr(result, len, 1);
 #endif

 	return (result);
@@ -199,16 +199,16 @@ textout(text *vlena)
 /*
 * textlen -
 *	  returns the actual length of a text*
- *     (which is less than the VARSIZE of the text*)
+ *	   (which is less than the VARSIZE of the text*)
 */
 int32
 textlen(text *t)
 {
 	if (!PointerIsValid(t))
-		elog(ERROR,"Null input to textlen");
+		elog(ERROR, "Null input to textlen");

 	return (VARSIZE(t) - VARHDRSZ);
-} /* textlen() */
+}	/* textlen() */

 /*
 * textcat -
@@ -259,7 +259,7 @@ textcat(text *t1, text *t2)
 	VARSIZE(result) = len;

 	return (result);
-} /* textcat() */
+}	/* textcat() */

 /*
 * text_substr()
@@ -267,17 +267,17 @@ textcat(text *t1, text *t2)
 * - thomas 1997-12-31
 *
 * Input:
- *  - string
- *  - starting position (is one-based)
- *  - string length
+ *	- string
+ *	- starting position (is one-based)
+ *	- string length
 *
 * If the starting position is zero or less, then return the entire string.
 * XXX Note that this may not be the right behavior:
- *  if we are calculating the starting position we might want it to start at one.
+ *	if we are calculating the starting position we might want it to start at one.
 * If the length is less than zero, return the remaining string.
 *
 * Note that the arguments operate on octet length,
- *  so not aware of multi-byte character sets.
+ *	so not aware of multi-byte character sets.
 */
 text *
 text_substr(text *string, int32 m, int32 n)
@@ -299,17 +299,17 @@ text_substr(text *string, int32 m, int32 n)
 	else
 	{
 		m--;
-		if (((m+n) > len) || (n < 0))
-			n = (len-m);
+		if (((m + n) > len) || (n < 0))
+			n = (len - m);
 	}

 	ret = (text *) palloc(VARHDRSZ + n);
 	VARSIZE(ret) = VARHDRSZ + n;

-	memcpy(VARDATA(ret), VARDATA(string)+m, n);
+	memcpy(VARDATA(ret), VARDATA(string) + m, n);

 	return ret;
-} /* text_substr() */
+}	/* text_substr() */

 /*
 * textpos -
@@ -351,7 +351,7 @@ textpos(text *t1, text *t2)
 		p1++;
 	};
 	return (pos);
-} /* textpos() */
+}	/* textpos() */

 /*
 *		texteq			- returns 1 iff arguments are equal
@@ -381,7 +381,7 @@ texteq(text *arg1, text *arg2)
 		if (*a1p++ != *a2p++)
 			return ((bool) 0);
 	return ((bool) 1);
-} /* texteq() */
+}	/* texteq() */

 bool
 textne(text *arg1, text *arg2)
@@ -443,7 +443,7 @@ text_lt(text *arg1, text *arg2)
 #endif

 	return (result);
-} /* text_lt() */
+}	/* text_lt() */

 /* text_le()
 * Comparison function for text strings.
@@ -499,7 +499,7 @@ text_le(text *arg1, text *arg2)
 #endif

 	return (result);
-} /* text_le() */
+}	/* text_le() */

 bool
 text_gt(text *arg1, text *arg2)