pgindent run.

contrib/btree_gist/btree_gist.c

@@ -299,11 +299,12 @@ gts_compress(PG_FUNCTION_ARGS)
 	if (entry->leafkey)
 	{
 		TSKEY	   *r = (TSKEY *) palloc(sizeof(TSKEY));
+
 		retval = palloc(sizeof(GISTENTRY));
 		r->lower = r->upper = *(Timestamp *) (entry->key);
 		gistentryinit(*retval, PointerGetDatum(r),
-			  entry->rel, entry->page,
-			  entry->offset, sizeof(TSKEY), FALSE);
+					  entry->rel, entry->page,
+					  entry->offset, sizeof(TSKEY), FALSE);
 	}
 	else
 		retval = entry;
@@ -398,8 +399,8 @@ gts_penalty(PG_FUNCTION_ARGS)
 
 	intr = DatumGetIntervalP(DirectFunctionCall2(
 												 timestamp_mi,
-									  TimestampGetDatumFast(newentry->upper),
-								   TimestampGetDatumFast(origentry->upper)));
+								  TimestampGetDatumFast(newentry->upper),
+							   TimestampGetDatumFast(origentry->upper)));
 
 	/* see interval_larger */
 	*result = Max(intr->time + intr->month * (30.0 * 86400), 0);
@@ -407,8 +408,8 @@ gts_penalty(PG_FUNCTION_ARGS)
 
 	intr = DatumGetIntervalP(DirectFunctionCall2(
 												 timestamp_mi,
-									 TimestampGetDatumFast(origentry->lower),
-									TimestampGetDatumFast(newentry->lower)));
+								 TimestampGetDatumFast(origentry->lower),
+								TimestampGetDatumFast(newentry->lower)));
 
 	/* see interval_larger */
 	*result += Max(intr->time + intr->month * (30.0 * 86400), 0);
@@ -473,8 +474,8 @@ tskey_cmp(const void *a, const void *b)
 	return DatumGetInt32(
 						 DirectFunctionCall2(
 											 timestamp_cmp,
-				  TimestampGetDatumFast(((TSKEY *) (((RIX *) a)->r))->lower),
-				   TimestampGetDatumFast(((TSKEY *) (((RIX *) b)->r))->lower)
+			  TimestampGetDatumFast(((TSKEY *) (((RIX *) a)->r))->lower),
+			   TimestampGetDatumFast(((TSKEY *) (((RIX *) b)->r))->lower)
 											 )
 		);
 }

contrib/dbase/dbf2pg.c

@@ -309,7 +309,7 @@ do_create(PGconn *conn, char *table, dbhead * dbh)
 				{
 					strcat(query, " varchar");
 					snprintf(t, 20, "(%d)",
-							dbh->db_fields[i].db_flen);
+							 dbh->db_fields[i].db_flen);
 					strcat(query, t);
 				}
 				else
@@ -468,8 +468,8 @@ do_inserts(PGconn *conn, char *table, dbhead * dbh)
 					if ((strlen(foo) == 8) && isinteger(foo))
 					{
 						snprintf(pgdate, 11, "%c%c%c%c-%c%c-%c%c",
-								foo[0], foo[1], foo[2], foo[3],
-								foo[4], foo[5], foo[6], foo[7]);
+								 foo[0], foo[1], foo[2], foo[3],
+								 foo[4], foo[5], foo[6], foo[7]);
 						strcat(query, pgdate);
 					}
 					else

contrib/dblink/dblink.h

@@ -74,6 +74,6 @@ extern Datum dblink_build_sql_delete(PG_FUNCTION_ARGS);
 extern Datum dblink_build_sql_update(PG_FUNCTION_ARGS);
 extern Datum dblink_current_query(PG_FUNCTION_ARGS);
 
-extern char	*debug_query_string;
+extern char *debug_query_string;
 
 #endif   /* DBLINK_H */

contrib/dbsize/dbsize.c

@@ -37,7 +37,7 @@ psnprintf(size_t len, const char *fmt,...)
 
 PG_FUNCTION_INFO_V1(database_size);
 
-Datum database_size(PG_FUNCTION_ARGS);
+Datum		database_size(PG_FUNCTION_ARGS);
 
 Datum
 database_size(PG_FUNCTION_ARGS)
@@ -97,7 +97,7 @@ database_size(PG_FUNCTION_ARGS)
 
 PG_FUNCTION_INFO_V1(relation_size);
 
-Datum relation_size(PG_FUNCTION_ARGS);
+Datum		relation_size(PG_FUNCTION_ARGS);
 
 Datum
 relation_size(PG_FUNCTION_ARGS)
@@ -111,7 +111,7 @@ relation_size(PG_FUNCTION_ARGS)
 	unsigned int segcount;
 
 	relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname,
-															 "relation_size"));
+													   "relation_size"));
 	relation = heap_openrv(relrv, AccessShareLock);
 
 	relnode = relation->rd_rel->relfilenode;

contrib/findoidjoins/findoidjoins.c

@@ -73,7 +73,7 @@ main(int argc, char **argv)
 					SELECT	count(*)::int4 \
 						FROM \"%s\" t1, \"%s\" t2 \
 					WHERE t1.\"%s\" = t2.oid ",
-						relname, relname2, attname);
+						 relname, relname2, attname);
 			else
 				sprintf(query, 4000, "\
 					DECLARE c_matches BINARY CURSOR FOR \

contrib/intagg/int_aggregate.c

@@ -11,7 +11,7 @@
  * This file is the property of the Digital Music Network (DMN).
  * It is being made available to users of the PostgreSQL system
  * under the BSD license.
- * 
+ *
  * NOTE: This module requires sizeof(void *) to be the same as sizeof(int)
  */
 #include "postgres.h"
@@ -45,31 +45,31 @@
 
 typedef struct
 {
-	ArrayType a;
-	int 	items;
-	int 	lower;
-	int4	array[1];
-}PGARRAY;
+	ArrayType	a;
+	int			items;
+	int			lower;
+	int4		array[1];
+}	PGARRAY;
 
 /* This is used to keep track of our position during enumeration */
 typedef struct callContext
 {
-	PGARRAY *p;
-	int num;
-	int flags;
-}CTX;
+	PGARRAY    *p;
+	int			num;
+	int			flags;
+}	CTX;
 
 #define TOASTED		1
-#define START_NUM 	8
+#define START_NUM	8
 #define PGARRAY_SIZE(n) (sizeof(PGARRAY) + ((n-1)*sizeof(int4)))
 
-static PGARRAY * GetPGArray(int4 state, int fAdd);
-static PGARRAY *ShrinkPGArray(PGARRAY *p);
+static PGARRAY *GetPGArray(int4 state, int fAdd);
+static PGARRAY *ShrinkPGArray(PGARRAY * p);
 
-Datum int_agg_state(PG_FUNCTION_ARGS);
-Datum int_agg_final_count(PG_FUNCTION_ARGS);
-Datum int_agg_final_array(PG_FUNCTION_ARGS);
-Datum int_enum(PG_FUNCTION_ARGS);
+Datum		int_agg_state(PG_FUNCTION_ARGS);
+Datum		int_agg_final_count(PG_FUNCTION_ARGS);
+Datum		int_agg_final_array(PG_FUNCTION_ARGS);
+Datum		int_enum(PG_FUNCTION_ARGS);
 
 PG_FUNCTION_INFO_V1(int_agg_state);
 PG_FUNCTION_INFO_V1(int_agg_final_count);
@@ -80,20 +80,21 @@ PG_FUNCTION_INFO_V1(int_enum);
  * Manage the aggregation state of the array
  * You need to specify the correct memory context, or it will vanish!
  */
-static PGARRAY * GetPGArray(int4 state, int fAdd)
+static PGARRAY *
+GetPGArray(int4 state, int fAdd)
 {
-	PGARRAY *p = (PGARRAY *) state;
+	PGARRAY    *p = (PGARRAY *) state;
 
-	if(!state)
+	if (!state)
 	{
 		/* New array */
-		int cb = PGARRAY_SIZE(START_NUM);
+		int			cb = PGARRAY_SIZE(START_NUM);
 
 		p = (PGARRAY *) MemoryContextAlloc(TopTransactionContext, cb);
 
-		if(!p)
+		if (!p)
 		{
-			elog(ERROR,"Integer aggregator, cant allocate TopTransactionContext memory");
+			elog(ERROR, "Integer aggregator, cant allocate TopTransactionContext memory");
 			return 0;
 		}
 
@@ -104,22 +105,22 @@ static PGARRAY * GetPGArray(int4 state, int fAdd)
 		p->a.elemtype = INT4OID;
 #endif
 		p->items = 0;
-		p->lower= START_NUM;
+		p->lower = START_NUM;
 	}
-	else if(fAdd)
-	{	/* Ensure array has space */
-		if(p->items >= p->lower)
+	else if (fAdd)
+	{							/* Ensure array has space */
+		if (p->items >= p->lower)
 		{
-			PGARRAY *pn;
-			int n = p->lower + p->lower;
-			int cbNew = PGARRAY_SIZE(n);
+			PGARRAY    *pn;
+			int			n = p->lower + p->lower;
+			int			cbNew = PGARRAY_SIZE(n);
 
 			pn = (PGARRAY *) repalloc(p, cbNew);
 
-			if(!pn)
-			{	/* Realloc failed! Reallocate new block. */
+			if (!pn)
+			{					/* Realloc failed! Reallocate new block. */
 				pn = (PGARRAY *) MemoryContextAlloc(TopTransactionContext, cbNew);
-				if(!pn)
+				if (!pn)
 				{
 					elog(ERROR, "Integer aggregator, REALLY REALLY can't alloc memory");
 					return (PGARRAY *) NULL;
@@ -136,24 +137,29 @@ static PGARRAY * GetPGArray(int4 state, int fAdd)
 }
 
 /* Shrinks the array to its actual size and moves it into the standard
- * memory allocation context, frees working memory  */
-static PGARRAY *ShrinkPGArray(PGARRAY *p)
+ * memory allocation context, frees working memory	*/
+static PGARRAY *
+ShrinkPGArray(PGARRAY * p)
 {
-	PGARRAY *pnew=NULL;
-	if(p)
+	PGARRAY    *pnew = NULL;
+
+	if (p)
 	{
 		/* get target size */
-		int cb = PGARRAY_SIZE(p->items);
+		int			cb = PGARRAY_SIZE(p->items);
 
 		/* use current transaction context */
 		pnew = palloc(cb);
 
-		if(pnew)
+		if (pnew)
 		{
-			/* Fix up the fields in the new structure, so Postgres understands */
+			/*
+			 * Fix up the fields in the new structure, so Postgres
+			 * understands
+			 */
 			memcpy(pnew, p, cb);
 			pnew->a.size = cb;
-			pnew->a.ndim=1;
+			pnew->a.ndim = 1;
 			pnew->a.flags = 0;
 #ifndef PG_7_2
 			pnew->a.elemtype = INT4OID;
@@ -161,79 +167,72 @@ static PGARRAY *ShrinkPGArray(PGARRAY *p)
 			pnew->lower = 0;
 		}
 		else
-		{
 			elog(ERROR, "Integer aggregator, can't allocate memory");
-		}
 		pfree(p);
 	}
 	return pnew;
 }
 
 /* Called for each iteration during an aggregate function */
-Datum int_agg_state(PG_FUNCTION_ARGS)
+Datum
+int_agg_state(PG_FUNCTION_ARGS)
 {
-	int4 state = PG_GETARG_INT32(0);
-	int4 value = PG_GETARG_INT32(1);
+	int4		state = PG_GETARG_INT32(0);
+	int4		value = PG_GETARG_INT32(1);
 
-	PGARRAY *p = GetPGArray(state, 1);
-	if(!p)
-	{
-		elog(ERROR,"No aggregate storage");
-	}
-	else if(p->items >= p->lower)
-	{
-		elog(ERROR,"aggregate storage too small");
-	}
+	PGARRAY    *p = GetPGArray(state, 1);
+
+	if (!p)
+		elog(ERROR, "No aggregate storage");
+	else if (p->items >= p->lower)
+		elog(ERROR, "aggregate storage too small");
 	else
-	{
-		p->array[p->items++]= value;
-	}
+		p->array[p->items++] = value;
 	PG_RETURN_INT32(p);
 }
 
 /* This is the final function used for the integer aggregator. It returns all the integers
  * collected as a one dimentional integer array */
-Datum int_agg_final_array(PG_FUNCTION_ARGS)
+Datum
+int_agg_final_array(PG_FUNCTION_ARGS)
 {
-	PGARRAY *pnew = ShrinkPGArray(GetPGArray(PG_GETARG_INT32(0),0));
-	if(pnew)
-	{
+	PGARRAY    *pnew = ShrinkPGArray(GetPGArray(PG_GETARG_INT32(0), 0));
+
+	if (pnew)
 		PG_RETURN_POINTER(pnew);
-	}
 	else
-	{
 		PG_RETURN_NULL();
-	}
 }
 
 /* This function accepts an array, and returns one item for each entry in the array */
-Datum int_enum(PG_FUNCTION_ARGS)
+Datum
+int_enum(PG_FUNCTION_ARGS)
 {
-	PGARRAY *p = (PGARRAY *) PG_GETARG_POINTER(0);
-	CTX *pc;
-	ReturnSetInfo *rsi = (ReturnSetInfo *)fcinfo->resultinfo;
+	PGARRAY    *p = (PGARRAY *) PG_GETARG_POINTER(0);
+	CTX		   *pc;
+	ReturnSetInfo *rsi = (ReturnSetInfo *) fcinfo->resultinfo;
 
 	if (!rsi || !IsA(rsi, ReturnSetInfo))
 		elog(ERROR, "No ReturnSetInfo sent! function must be declared returning a 'setof' integer");
 
-	if(!p)
+	if (!p)
 	{
 		elog(WARNING, "No data sent");
 		PG_RETURN_NULL();
 	}
 
-	if(!fcinfo->context)
+	if (!fcinfo->context)
 	{
 		/* Allocate a working context */
 		pc = (CTX *) palloc(sizeof(CTX));
 
 		/* Don't copy atribute if you don't need too */
-		if(VARATT_IS_EXTENDED(p) )
+		if (VARATT_IS_EXTENDED(p))
 		{
 			/* Toasted!!! */
 			pc->p = (PGARRAY *) PG_DETOAST_DATUM_COPY(p);
 			pc->flags = TOASTED;
-			if(!pc->p)
+			if (!pc->p)
 			{
 				elog(ERROR, "Error in toaster!!! no detoasting");
 				PG_RETURN_NULL();
@@ -246,25 +245,26 @@ Datum int_enum(PG_FUNCTION_ARGS)
 			pc->flags = 0;
 		}
 		fcinfo->context = (Node *) pc;
-		pc->num=0;
+		pc->num = 0;
 	}
-	else /* use an existing one */
-	{
+	else
+/* use an existing one */
 		pc = (CTX *) fcinfo->context;
-	}
 	/* Are we done yet? */
-	if(pc->num >= pc->p->items)
+	if (pc->num >= pc->p->items)
 	{
 		/* We are done */
-		if(pc->flags & TOASTED)
+		if (pc->flags & TOASTED)
 			pfree(pc->p);
 		pfree(fcinfo->context);
 		fcinfo->context = NULL;
-		rsi->isDone = ExprEndResult ;
+		rsi->isDone = ExprEndResult;
 	}
-	else	/* nope, return the next value */
+	else
+/* nope, return the next value */
 	{
-		int val = pc->p->array[pc->num++];
+		int			val = pc->p->array[pc->num++];
+
 		rsi->isDone = ExprMultipleResult;
 		PG_RETURN_INT32(val);
 	}

contrib/ltree/crc32.c

@@ -105,6 +105,6 @@ ltree_crc32_sz(char *buf, int size)
 	len = 0;
 	nr = size;
 	for (len += nr, p = buf; nr--; ++p)
-		_CRC32_(crc, TOLOWER((unsigned int)*p));
+		_CRC32_(crc, TOLOWER((unsigned int) *p));
 	return ~crc;
 }

contrib/ltree/lquery_op.c

 /*
- * op function for ltree and lquery 
+ * op function for ltree and lquery
  * Teodor Sigaev <teodor@stack.net>
  */
 
@@ -9,27 +9,29 @@
 PG_FUNCTION_INFO_V1(ltq_regex);
 PG_FUNCTION_INFO_V1(ltq_rregex);
 
-typedef struct {
-	lquery_level	*q;
-	int		nq;
-	ltree_level	*t;
-	int		nt;
-	int		posq;
-	int		post;
-} FieldNot;
+typedef struct
+{
+	lquery_level *q;
+	int			nq;
+	ltree_level *t;
+	int			nt;
+	int			posq;
+	int			post;
+}	FieldNot;
 
 static char *
-getlexem(char *start, char *end, int *len) {
-	char *ptr;
-	
-	while( start<end && *start == '_' )
+getlexem(char *start, char *end, int *len)
+{
+	char	   *ptr;
+
+	while (start < end && *start == '_')
 		start++;
 
 	ptr = start;
-	if ( ptr == end )
+	if (ptr == end)
 		return NULL;
 
-	while( ptr < end && *ptr != '_') 
+	while (ptr < end && *ptr != '_')
 		ptr++;
 
 	*len = ptr - start;
@@ -37,31 +39,36 @@ getlexem(char *start, char *end, int *len) {
 }
 
 bool
-compare_subnode( ltree_level *t, char *qn, int len, int (*cmpptr)(const char *,const char *,size_t), bool anyend ) {
-	char *endt = t->name + t->len;
-	char *endq = qn + len;
-	char *tn;
-	int lent,lenq;
-	bool	isok;
-
-	while( (qn=getlexem(qn,endq,&lenq)) != NULL ) {
-		tn=t->name;
+			compare_subnode(ltree_level * t, char *qn, int len, int (*cmpptr) (const char *, const char *, size_t), bool anyend)
+{
+	char	   *endt = t->name + t->len;
+	char	   *endq = qn + len;
+	char	   *tn;
+	int			lent,
+				lenq;
+	bool		isok;
+
+	while ((qn = getlexem(qn, endq, &lenq)) != NULL)
+	{
+		tn = t->name;
 		isok = false;
-		while( (tn=getlexem(tn,endt,&lent)) != NULL ) {
-			if ( 
+		while ((tn = getlexem(tn, endt, &lent)) != NULL)
+		{
+			if (
 				(
-					lent == lenq ||
-					( lent > lenq && anyend )
-				) &&
-				(*cmpptr)(qn,tn,lenq) == 0 ) {
-		
-				isok = true;	
+				 lent == lenq ||
+				 (lent > lenq && anyend)
+				 ) &&
+				(*cmpptr) (qn, tn, lenq) == 0)
+			{
+
+				isok = true;
 				break;
 			}
 			tn += lent;
 		}
 
-		if ( !isok )
+		if (!isok)
 			return false;
 		qn += lenq;
 	}
@@ -70,27 +77,32 @@ compare_subnode( ltree_level *t, char *qn, int len, int (*cmpptr)(const char *,c
 }
 
 static bool
-checkLevel( lquery_level *curq, ltree_level *curt ) {
-	int (*cmpptr)(const char *,const char *,size_t);
+checkLevel(lquery_level * curq, ltree_level * curt)
+{
+	int			(*cmpptr) (const char *, const char *, size_t);
 	lquery_variant *curvar = LQL_FIRST(curq);
-	int i;
-	
-	for(i=0;i<curq->numvar;i++) {
-		cmpptr = ( curvar->flag & LVAR_INCASE ) ? strncasecmp : strncmp;
+	int			i;
 
-		if ( curvar->flag & LVAR_SUBLEXEM ) {
-			if ( compare_subnode(curt, curvar->name, curvar->len, cmpptr, (curvar->flag & LVAR_ANYEND) ) )
+	for (i = 0; i < curq->numvar; i++)
+	{
+		cmpptr = (curvar->flag & LVAR_INCASE) ? strncasecmp : strncmp;
+
+		if (curvar->flag & LVAR_SUBLEXEM)
+		{
+			if (compare_subnode(curt, curvar->name, curvar->len, cmpptr, (curvar->flag & LVAR_ANYEND)))
 				return true;
-		} else if ( 
-			( 
-				curvar->len == curt->len || 
-				( curt->len > curvar->len && (curvar->flag & LVAR_ANYEND) )  
-			) && 
-			(*cmpptr)( curvar->name, curt->name, curvar->len) == 0 ) {
+		}
+		else if (
+				 (
+				  curvar->len == curt->len ||
+				(curt->len > curvar->len && (curvar->flag & LVAR_ANYEND))
+				  ) &&
+				 (*cmpptr) (curvar->name, curt->name, curvar->len) == 0)
+		{
 
 			return true;
 		}
-		curvar = LVAR_NEXT(curvar); 
+		curvar = LVAR_NEXT(curvar);
 	}
 	return false;
 }
@@ -102,78 +114,97 @@ printFieldNot(FieldNot *fn ) {
 		elog(NOTICE,"posQ:%d lenQ:%d posT:%d lenT:%d", fn->posq,fn->nq,fn->post,fn->nt);
 		fn++;
 	}
-} 
+}
 */
 
 static bool
-checkCond( lquery_level *curq, int query_numlevel, ltree_level *curt, int tree_numlevel, FieldNot *ptr ) {
-	uint32 low_pos=0,high_pos=0,cur_tpos=0;
-	int tlen = tree_numlevel, qlen = query_numlevel;
-	int isok;
-	lquery_level *prevq=NULL;
-	ltree_level  *prevt=NULL;
-
-	while( tlen >0 && qlen>0 ) {
-		if ( curq->numvar ) {
+checkCond(lquery_level * curq, int query_numlevel, ltree_level * curt, int tree_numlevel, FieldNot * ptr)
+{
+	uint32		low_pos = 0,
+				high_pos = 0,
+				cur_tpos = 0;
+	int			tlen = tree_numlevel,
+				qlen = query_numlevel;
+	int			isok;
+	lquery_level *prevq = NULL;
+	ltree_level *prevt = NULL;
+
+	while (tlen > 0 && qlen > 0)
+	{
+		if (curq->numvar)
+		{
 			prevt = curt;
-			while ( cur_tpos < low_pos ) {
+			while (cur_tpos < low_pos)
+			{
 				curt = LEVEL_NEXT(curt);
 				tlen--;
 				cur_tpos++;
-				if ( tlen==0 )
+				if (tlen == 0)
 					return false;
-				if ( ptr && ptr->q )
+				if (ptr && ptr->q)
 					ptr->nt++;
 			}
-			
-			if ( ptr && curq->flag & LQL_NOT ) {
-				if ( !(prevq && prevq->numvar == 0) )
+
+			if (ptr && curq->flag & LQL_NOT)
+			{
+				if (!(prevq && prevq->numvar == 0))
 					prevq = curq;
-				if ( ptr->q == NULL ) {
+				if (ptr->q == NULL)
+				{
 					ptr->t = prevt;
 					ptr->q = prevq;
-					ptr->nt=1;
-					ptr->nq=1 + ( (prevq==curq) ? 0 : 1 );
-					ptr->posq = query_numlevel - qlen - ( (prevq==curq) ? 0 : 1 ); 
+					ptr->nt = 1;
+					ptr->nq = 1 + ((prevq == curq) ? 0 : 1);
+					ptr->posq = query_numlevel - qlen - ((prevq == curq) ? 0 : 1);
 					ptr->post = cur_tpos;
-				} else {
+				}
+				else
+				{
 					ptr->nt++;
 					ptr->nq++;
 				}
 
-				if ( qlen == 1 && ptr->q->numvar==0 )
-					ptr->nt = tree_numlevel - ptr->post; 
+				if (qlen == 1 && ptr->q->numvar == 0)
+					ptr->nt = tree_numlevel - ptr->post;
 				curt = LEVEL_NEXT(curt);
 				tlen--;
 				cur_tpos++;
-				if ( high_pos < cur_tpos )
+				if (high_pos < cur_tpos)
 					high_pos++;
-			} else { 
+			}
+			else
+			{
 				isok = false;
-				while( cur_tpos <= high_pos && tlen > 0 && !isok) {
+				while (cur_tpos <= high_pos && tlen > 0 && !isok)
+				{
 					isok = checkLevel(curq, curt);
 					curt = LEVEL_NEXT(curt);
 					tlen--;
 					cur_tpos++;
-					if ( !isok && ptr )
+					if (!isok && ptr)
 						ptr->nt++;
 				}
-				if ( !isok )
+				if (!isok)
 					return false;
 
-				if (ptr && ptr->q) {
-					if ( checkCond(ptr->q,ptr->nq,ptr->t,ptr->nt,NULL) )
+				if (ptr && ptr->q)
+				{
+					if (checkCond(ptr->q, ptr->nq, ptr->t, ptr->nt, NULL))
 						return false;
 					ptr->q = NULL;
 				}
-				low_pos=cur_tpos; high_pos=cur_tpos;
+				low_pos = cur_tpos;
+				high_pos = cur_tpos;
 			}
-		} else {
+		}
+		else
+		{
 			low_pos = cur_tpos + curq->low;
 			high_pos = cur_tpos + curq->high;
-			if ( ptr && ptr->q ) {
+			if (ptr && ptr->q)
+			{
 				ptr->nq++;
-				if ( qlen==1 )
+				if (qlen == 1)
 					ptr->nt = tree_numlevel - ptr->post;
 			}
 		}
@@ -181,16 +212,20 @@ checkCond( lquery_level *curq, int query_numlevel, ltree_level *curt, int tree_n
 		prevq = curq;
 		curq = LQL_NEXT(curq);
 		qlen--;
-	}	
+	}
 
-	if ( low_pos > tree_numlevel || tree_numlevel > high_pos )
+	if (low_pos > tree_numlevel || tree_numlevel > high_pos)
 		return false;
 
-	while( qlen>0 ) {
-		if ( curq->numvar ) {
-			if ( ! (curq->flag & LQL_NOT) )
+	while (qlen > 0)
+	{
+		if (curq->numvar)
+		{
+			if (!(curq->flag & LQL_NOT))
 				return false;
-		} else {
+		}
+		else
+		{
 			low_pos = cur_tpos + curq->low;
 			high_pos = cur_tpos + curq->high;
 		}
@@ -199,42 +234,47 @@ checkCond( lquery_level *curq, int query_numlevel, ltree_level *curt, int tree_n
 		qlen--;
 	}
 
-	if ( low_pos > tree_numlevel || tree_numlevel > high_pos )
+	if (low_pos > tree_numlevel || tree_numlevel > high_pos)
 		return false;
-	
-	if ( ptr && ptr->q && checkCond(ptr->q,ptr->nq,ptr->t,ptr->nt,NULL) )
+
+	if (ptr && ptr->q && checkCond(ptr->q, ptr->nq, ptr->t, ptr->nt, NULL))
 		return false;
-	
+
 	return true;
 }
 
 Datum
-ltq_regex(PG_FUNCTION_ARGS) {
-	ltree *tree = PG_GETARG_LTREE(0);
-	lquery *query = PG_GETARG_LQUERY(1);
-	bool res= false;
+ltq_regex(PG_FUNCTION_ARGS)
+{
+	ltree	   *tree = PG_GETARG_LTREE(0);
+	lquery	   *query = PG_GETARG_LQUERY(1);
+	bool		res = false;
 
-	if ( query->flag & LQUERY_HASNOT ) {
+	if (query->flag & LQUERY_HASNOT)
+	{
 		FieldNot	fn;
 
-		fn.q=NULL;
+		fn.q = NULL;
 
-		res = checkCond( LQUERY_FIRST(query), query->numlevel, 
-			LTREE_FIRST(tree), tree->numlevel, &fn );
-	} else {
-		res = checkCond( LQUERY_FIRST(query), query->numlevel, 
-			LTREE_FIRST(tree), tree->numlevel, NULL ); 
+		res = checkCond(LQUERY_FIRST(query), query->numlevel,
+						LTREE_FIRST(tree), tree->numlevel, &fn);
+	}
+	else
+	{
+		res = checkCond(LQUERY_FIRST(query), query->numlevel,
+						LTREE_FIRST(tree), tree->numlevel, NULL);
 	}
 
-        PG_FREE_IF_COPY(tree,0);
-        PG_FREE_IF_COPY(query,1);
-        PG_RETURN_BOOL(res);
+	PG_FREE_IF_COPY(tree, 0);
+	PG_FREE_IF_COPY(query, 1);
+	PG_RETURN_BOOL(res);
 }
 
-Datum 
-ltq_rregex(PG_FUNCTION_ARGS) {
-	PG_RETURN_DATUM( DirectFunctionCall2( ltq_regex,
-		PG_GETARG_DATUM(1),
-		PG_GETARG_DATUM(0)
-	) );
+Datum
+ltq_rregex(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall2(ltq_regex,
+										PG_GETARG_DATUM(1),
+										PG_GETARG_DATUM(0)
+										));
 }

contrib/ltree/ltxtquery_op.c

 /*
- * txtquery operations with ltree 
+ * txtquery operations with ltree
  * Teodor Sigaev <teodor@stack.net>
  */
 
@@ -12,20 +12,26 @@ PG_FUNCTION_INFO_V1(ltxtq_rexec);
 /*
  * check for boolean condition
  */
-bool 
-ltree_execute(ITEM * curitem, void *checkval, bool calcnot, bool (*chkcond) (void *checkval, ITEM * val)) {
+bool
+ltree_execute(ITEM * curitem, void *checkval, bool calcnot, bool (*chkcond) (void *checkval, ITEM * val))
+{
 	if (curitem->type == VAL)
 		return (*chkcond) (checkval, curitem);
-	else if (curitem->val == (int4) '!') {
+	else if (curitem->val == (int4) '!')
+	{
 		return (calcnot) ?
 			((ltree_execute(curitem + 1, checkval, calcnot, chkcond)) ? false : true)
 			: true;
-	} else if (curitem->val == (int4) '&') {
-		if (ltree_execute(curitem + curitem->left, checkval, calcnot, chkcond))   
+	}
+	else if (curitem->val == (int4) '&')
+	{
+		if (ltree_execute(curitem + curitem->left, checkval, calcnot, chkcond))
 			return ltree_execute(curitem + 1, checkval, calcnot, chkcond);
 		else
 			return false;
-	} else   {						       /* |-operator */
+	}
+	else
+	{							/* |-operator */
 		if (ltree_execute(curitem + curitem->left, checkval, calcnot, chkcond))
 			return true;
 		else
@@ -34,54 +40,60 @@ ltree_execute(ITEM * curitem, void *checkval, bool calcnot, bool (*chkcond) (voi
 	return false;
 }
 
-typedef struct {
-	ltree	*node;
-	char       *operand;
-} CHKVAL;
+typedef struct
+{
+	ltree	   *node;
+	char	   *operand;
+}	CHKVAL;
 
 static bool
-checkcondition_str(void* checkval, ITEM * val) {
-	ltree_level *level = LTREE_FIRST( ((CHKVAL*)checkval)->node );
-	int tlen = ((CHKVAL*)checkval)->node->numlevel;
-	char *op = ((CHKVAL*)checkval)->operand + val->distance;
-        int (*cmpptr)(const char *,const char *,size_t);
+checkcondition_str(void *checkval, ITEM * val)
+{
+	ltree_level *level = LTREE_FIRST(((CHKVAL *) checkval)->node);
+	int			tlen = ((CHKVAL *) checkval)->node->numlevel;
+	char	   *op = ((CHKVAL *) checkval)->operand + val->distance;
+	int			(*cmpptr) (const char *, const char *, size_t);
 
-	cmpptr = ( val->flag & LVAR_INCASE ) ? strncasecmp : strncmp;
-	while( tlen > 0 ) {
-		if ( val->flag & LVAR_SUBLEXEM ) {
-			if ( compare_subnode(level, op, val->length, cmpptr, (val->flag & LVAR_ANYEND) ) )
+	cmpptr = (val->flag & LVAR_INCASE) ? strncasecmp : strncmp;
+	while (tlen > 0)
+	{
+		if (val->flag & LVAR_SUBLEXEM)
+		{
+			if (compare_subnode(level, op, val->length, cmpptr, (val->flag & LVAR_ANYEND)))
 				return true;
-		} else if ( 
-			(
-				val->length == level->len ||
-				( level->len > val->length && (val->flag & LVAR_ANYEND) )
-			) &&
-				(*cmpptr)( op, level->name, val->length) == 0 )
+		}
+		else if (
+				 (
+				  val->length == level->len ||
+				  (level->len > val->length && (val->flag & LVAR_ANYEND))
+				  ) &&
+				 (*cmpptr) (op, level->name, val->length) == 0)
 			return true;
 
 		tlen--;
-		level = LEVEL_NEXT(level); 
+		level = LEVEL_NEXT(level);
 	}
 
 	return false;
 }
 
 Datum
-ltxtq_exec(PG_FUNCTION_ARGS) {
-	ltree     *val = PG_GETARG_LTREE(0);
+ltxtq_exec(PG_FUNCTION_ARGS)
+{
+	ltree	   *val = PG_GETARG_LTREE(0);
 	ltxtquery  *query = PG_GETARG_LTXTQUERY(1);
-	CHKVAL	  chkval;
-	bool	    result;
+	CHKVAL		chkval;
+	bool		result;
 
 	chkval.node = val;
 	chkval.operand = GETOPERAND(query);
 
 	result = ltree_execute(
-		GETQUERY(query),
-		&chkval,
-		true,
-		checkcondition_str
-	);
+						   GETQUERY(query),
+						   &chkval,
+						   true,
+						   checkcondition_str
+		);
 
 	PG_FREE_IF_COPY(val, 0);
 	PG_FREE_IF_COPY(query, 1);
@@ -89,11 +101,10 @@ ltxtq_exec(PG_FUNCTION_ARGS) {
 }
 
 Datum
-ltxtq_rexec(PG_FUNCTION_ARGS) {
-	PG_RETURN_DATUM( DirectFunctionCall2( ltxtq_exec,
-		PG_GETARG_DATUM(1),
-		PG_GETARG_DATUM(0)
-	) );
+ltxtq_rexec(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall2(ltxtq_exec,
+										PG_GETARG_DATUM(1),
+										PG_GETARG_DATUM(0)
+										));
 }
-
-

contrib/mSQL-interface/mpgsql.c

@@ -263,7 +263,7 @@ msqlListTables(int a)
 	char		tbuf[BUFSIZ];
 
 	snprintf(tbuf, BUFSIZ,
-			 "select relname from pg_class where relkind='r' and relowner=%d",
+		"select relname from pg_class where relkind='r' and relowner=%d",
 			 getuid());
 	if (msqlQuery(a, tbuf) > 0)
 	{
@@ -287,7 +287,7 @@ msqlListIndex(int a, char *b, char *c)
 	char		tbuf[BUFSIZ];
 
 	snprintf(tbuf, BUFSIZ,
-			 "select relname from pg_class where relkind='i' and relowner=%d",
+		"select relname from pg_class where relkind='i' and relowner=%d",
 			 getuid());
 	if (msqlQuery(a, tbuf) > 0)
 	{

contrib/pg_dumplo/lo_export.c

 /* -------------------------------------------------------------------------
  * pg_dumplo
  *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/lo_export.c,v 1.9 2002/08/15 02:58:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/lo_export.c,v 1.10 2002/09/04 20:31:06 momjian Exp $
  *
  *					Karel Zak 1999-2000
  * -------------------------------------------------------------------------
@@ -142,7 +142,7 @@ pglo_export(LODumpMaster * pgLO)
 			{
 
 				snprintf(path, BUFSIZ, "%s/%s/%s", pgLO->space, pgLO->db,
-						ll->lo_table);
+						 ll->lo_table);
 
 				if (mkdir(path, DIR_UMASK) == -1)
 				{
@@ -154,7 +154,7 @@ pglo_export(LODumpMaster * pgLO)
 				}
 
 				snprintf(path, BUFSIZ, "%s/%s/%s/%s", pgLO->space, pgLO->db,
-						ll->lo_table, ll->lo_attr);
+						 ll->lo_table, ll->lo_attr);
 
 				if (mkdir(path, DIR_UMASK) == -1)
 				{
@@ -187,7 +187,7 @@ pglo_export(LODumpMaster * pgLO)
 				}
 
 				snprintf(path, BUFSIZ, "%s/%s/%s/%s/%s", pgLO->space,
-						pgLO->db, ll->lo_table, ll->lo_attr, val);
+						 pgLO->db, ll->lo_table, ll->lo_attr, val);
 
 				if (lo_export(pgLO->conn, lo, path) < 0)
 					fprintf(stderr, "%s: lo_export failed:\n%s", progname,

contrib/pg_dumplo/lo_import.c

 /* -------------------------------------------------------------------------
  * pg_dumplo
  *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/lo_import.c,v 1.7 2002/08/15 02:58:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/lo_import.c,v 1.8 2002/09/04 20:31:06 momjian Exp $
  *
  *					Karel Zak 1999-2000
  * -------------------------------------------------------------------------
@@ -82,7 +82,7 @@ pglo_import(LODumpMaster * pgLO)
 		 * UPDATE oid in tab
 		 */
 		snprintf(Qbuff, QUERY_BUFSIZ,
-			"UPDATE \"%s\" SET \"%s\"=%u WHERE \"%s\"=%u",
+				 "UPDATE \"%s\" SET \"%s\"=%u WHERE \"%s\"=%u",
 			loa.lo_table, loa.lo_attr, new_oid, loa.lo_attr, loa.lo_oid);
 
 		/* fprintf(stderr, Qbuff); */

contrib/spi/timetravel.c

@@ -270,7 +270,7 @@ timetravel(PG_FUNCTION_ARGS)
 		for (i = 1; i <= natts; i++)
 		{
 			snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), "$%d%s",
-					i, (i < natts) ? ", " : ")");
+					 i, (i < natts) ? ", " : ")");
 			ctypes[i - 1] = SPI_gettypeid(tupdesc, i);
 		}
 

contrib/tsearch/morph.c

@@ -114,7 +114,7 @@ initmorph(void)
 		needinit[i] = false;
 
 	PGLC_current(&lc);
-	if ( lc.lc_ctype )
+	if (lc.lc_ctype)
 		for (i = 1; i < lengthof(dicts); i++)
 			if (strcmp(dicts[i].localename, lc.lc_ctype) == 0)
 			{