pgindent run.

contrib/btree_gist/btree_gist.h

@@ -23,4 +23,3 @@ typedef struct rix
 
 extern GIST_SPLITVEC *btree_picksplit(bytea *entryvec, GIST_SPLITVEC *v,
 				BINARY_UNION bu, CMPFUNC cmp);
-

contrib/cube/cube.c

@@ -131,7 +131,8 @@ cube_out(NDBOX * cube)
 	 * Get the number of digits to display.
 	 */
 	ndig = DBL_DIG + extra_float_digits;
-	if (ndig < 1) ndig = 1;
+	if (ndig < 1)
+		ndig = 1;
 
 	/*
 	 * while printing the first (LL) corner, check if it is equal to the
@@ -1192,7 +1193,8 @@ cube_enlarge(NDBOX * a, double *r, int4 n)
 				j,
 				k;
 
-	if (n > CUBE_MAX_DIM) n = CUBE_MAX_DIM;
+	if (n > CUBE_MAX_DIM)
+		n = CUBE_MAX_DIM;
 	if (*r > 0 && n > 0)
 		dim = n;
 	if (a->dim > dim)
@@ -1235,6 +1237,7 @@ cube_f8(double *x1)
 {
 	NDBOX	   *result;
 	int			size;
+
 	size = offsetof(NDBOX, x[0]) + sizeof(double) * 2;
 	result = (NDBOX *) palloc(size);
 	memset(result, 0, size);
@@ -1251,6 +1254,7 @@ cube_f8_f8(double *x1, double *x2)
 {
 	NDBOX	   *result;
 	int			size;
+
 	size = offsetof(NDBOX, x[0]) + sizeof(double) * 2;
 	result = (NDBOX *) palloc(size);
 	memset(result, 0, size);
@@ -1264,17 +1268,19 @@ cube_f8_f8(double *x1, double *x2)
 /* Add a dimension to an existing cube with the same values for the new
    coordinate */
 NDBOX *
-cube_c_f8(NDBOX *c, double *x1)
+cube_c_f8(NDBOX * c, double *x1)
 {
 	NDBOX	   *result;
 	int			size;
 	int			i;
-	size = offsetof(NDBOX, x[0]) + sizeof(double) * (c->dim + 1) * 2;
+
+	size = offsetof(NDBOX, x[0]) + sizeof(double) * (c->dim + 1) *2;
 	result = (NDBOX *) palloc(size);
 	memset(result, 0, size);
 	result->size = size;
 	result->dim = c->dim + 1;
-        for (i = 0; i < c->dim; i++) {
+	for (i = 0; i < c->dim; i++)
+	{
 		result->x[i] = c->x[i];
 		result->x[result->dim + i] = c->x[c->dim + i];
 	}
@@ -1285,17 +1291,19 @@ cube_c_f8(NDBOX *c, double *x1)
 
 /* Add a dimension to an existing cube */
 NDBOX *
-cube_c_f8_f8(NDBOX *c, double *x1, double *x2)
+cube_c_f8_f8(NDBOX * c, double *x1, double *x2)
 {
 	NDBOX	   *result;
 	int			size;
 	int			i;
-	size = offsetof(NDBOX, x[0]) + sizeof(double) * (c->dim + 1) * 2;
+
+	size = offsetof(NDBOX, x[0]) + sizeof(double) * (c->dim + 1) *2;
 	result = (NDBOX *) palloc(size);
 	memset(result, 0, size);
 	result->size = size;
 	result->dim = c->dim + 1;
-        for (i = 0; i < c->dim; i++) {
+	for (i = 0; i < c->dim; i++)
+	{
 		result->x[i] = c->x[i];
 		result->x[result->dim + i] = c->x[c->dim + i];
 	}

contrib/dbase/dbf2pg.c

@@ -446,14 +446,12 @@ do_inserts(PGconn *conn, char *table, dbhead * dbh)
 			j = 0;				/* counter for fields in the output */
 			for (h = 0; h < dbh->db_nfields; h++)
 			{
-				if (!strlen(fields[h].db_name)) /* When the new fieldname is empty, the field is skipped */
-				{
+				if (!strlen(fields[h].db_name)) /* When the new fieldname
+												 * is empty, the field is
+												 * skipped */
 					continue;
-				}
 				else
-				{
 					j++;
-				}
 
 				if (j > 1)		/* not for the first field! */
 					strcat(query, "\t");		/* COPY statement field

contrib/dblink/dblink.c

@@ -63,7 +63,7 @@ typedef struct remoteConn
 {
 	PGconn	   *con;			/* Hold the remote connection */
 	bool		remoteTrFlag;	/* Indicates whether or not a transaction
-							 * on remote database is in progress*/
+								 * on remote database is in progress */
 }	remoteConn;
 
 /*
@@ -71,7 +71,7 @@ typedef struct remoteConn
  */
 static remoteConn *getConnectionByName(const char *name);
 static HTAB *createConnHash(void);
-static void createNewConnection(const char *name,remoteConn *con);
+static void createNewConnection(const char *name, remoteConn * con);
 static void deleteConnection(const char *name);
 static char **get_pkey_attnames(Oid relid, int16 *numatts);
 static char *get_sql_insert(Oid relid, int16 *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals);
@@ -89,7 +89,7 @@ static char *generate_relation_name(Oid relid);
 List	   *res_id = NIL;
 int			res_id_index = 0;
 PGconn	   *persistent_conn = NULL;
-static HTAB *remoteConnHash=NULL;
+static HTAB *remoteConnHash = NULL;
 
 /*
 Following is list that holds multiple remote connections.
@@ -186,18 +186,18 @@ dblink_connect(PG_FUNCTION_ARGS)
 	PGconn	   *conn = NULL;
 	remoteConn *rcon = NULL;
 
-	if(PG_NARGS()==2)
+	if (PG_NARGS() == 2)
 	{
 		connstr = GET_STR(PG_GETARG_TEXT_P(1));
 		connname = GET_STR(PG_GETARG_TEXT_P(0));
 	}
-	else if(PG_NARGS()==1)
+	else if (PG_NARGS() == 1)
 		connstr = GET_STR(PG_GETARG_TEXT_P(0));
 
 	oldcontext = MemoryContextSwitchTo(TopMemoryContext);
 
-	if(connname)
-		rcon=(remoteConn *) palloc(sizeof(remoteConn));
+	if (connname)
+		rcon = (remoteConn *) palloc(sizeof(remoteConn));
 	conn = PQconnectdb(connstr);
 
 	MemoryContextSwitchTo(oldcontext);
@@ -206,7 +206,7 @@ dblink_connect(PG_FUNCTION_ARGS)
 	{
 		msg = pstrdup(PQerrorMessage(conn));
 		PQfinish(conn);
-		if(rcon)
+		if (rcon)
 			pfree(rcon);
 
 		ereport(ERROR,
@@ -215,7 +215,7 @@ dblink_connect(PG_FUNCTION_ARGS)
 			errdetail("%s", msg)));
 	}
 
-	if(connname)
+	if (connname)
 	{
 		rcon->con = conn;
 		createNewConnection(connname, rcon);
@@ -237,7 +237,7 @@ dblink_disconnect(PG_FUNCTION_ARGS)
 	remoteConn *rcon = NULL;
 	PGconn	   *conn = NULL;
 
-	if (PG_NARGS() ==1 )
+	if (PG_NARGS() == 1)
 	{
 		conname = GET_STR(PG_GETARG_TEXT_P(0));
 		rcon = getConnectionByName(conname);
@@ -276,13 +276,13 @@ dblink_open(PG_FUNCTION_ARGS)
 	StringInfo	str = makeStringInfo();
 	remoteConn *rcon = NULL;
 
-	if(PG_NARGS() == 2)
+	if (PG_NARGS() == 2)
 	{
 		curname = GET_STR(PG_GETARG_TEXT_P(0));
 		sql = GET_STR(PG_GETARG_TEXT_P(1));
 		conn = persistent_conn;
 	}
-	else if(PG_NARGS() == 3)
+	else if (PG_NARGS() == 3)
 	{
 		conname = GET_STR(PG_GETARG_TEXT_P(0));
 		curname = GET_STR(PG_GETARG_TEXT_P(1));
@@ -333,12 +333,12 @@ dblink_close(PG_FUNCTION_ARGS)
 		curname = GET_STR(PG_GETARG_TEXT_P(0));
 		conn = persistent_conn;
 	}
-	else if (PG_NARGS()==2)
+	else if (PG_NARGS() == 2)
 	{
 		conname = GET_STR(PG_GETARG_TEXT_P(0));
 		curname = GET_STR(PG_GETARG_TEXT_P(1));
 		rcon = getConnectionByName(conname);
-		if(rcon)
+		if (rcon)
 			conn = rcon->con;
 	}
 
@@ -381,7 +381,7 @@ dblink_fetch(PG_FUNCTION_ARGS)
 	PGresult   *res = NULL;
 	MemoryContext oldcontext;
 	char	   *conname = NULL;
-	remoteConn *rcon=NULL;
+	remoteConn *rcon = NULL;
 
 	/* stuff done only on the first call of the function */
 	if (SRF_IS_FIRSTCALL())
@@ -401,7 +401,7 @@ dblink_fetch(PG_FUNCTION_ARGS)
 			howmany = PG_GETARG_INT32(2);
 
 			rcon = getConnectionByName(conname);
-			if(rcon)
+			if (rcon)
 				conn = rcon->con;
 		}
 		else if (PG_NARGS() == 2)
@@ -411,7 +411,7 @@ dblink_fetch(PG_FUNCTION_ARGS)
 			conn = persistent_conn;
 		}
 
-		if(!conn)
+		if (!conn)
 			DBLINK_CONN_NOT_AVAIL;
 
 		/* create a function context for cross-call persistence */
@@ -429,9 +429,7 @@ dblink_fetch(PG_FUNCTION_ARGS)
 		if (!res ||
 			(PQresultStatus(res) != PGRES_COMMAND_OK &&
 			 PQresultStatus(res) != PGRES_TUPLES_OK))
-		{
 			DBLINK_RES_ERROR("sql error");
-		}
 		else if (PQresultStatus(res) == PGRES_COMMAND_OK)
 		{
 			/* cursor does not exist - closed already or bad name */
@@ -549,7 +547,7 @@ dblink_record(PG_FUNCTION_ARGS)
 		char	   *connstr = NULL;
 		char	   *sql = NULL;
 		char	   *conname = NULL;
-		remoteConn *rcon=NULL;
+		remoteConn *rcon = NULL;
 
 		/* create a function context for cross-call persistence */
 		funcctx = SRF_FIRSTCALL_INIT();
@@ -574,7 +572,7 @@ dblink_record(PG_FUNCTION_ARGS)
 			/* shouldn't happen */
 			elog(ERROR, "wrong number of arguments");
 
-		if(!conn)
+		if (!conn)
 			DBLINK_CONN_NOT_AVAIL;
 
 		res = PQexec(conn, sql);
@@ -591,8 +589,8 @@ dblink_record(PG_FUNCTION_ARGS)
 							   TEXTOID, -1, 0, false);
 
 			/*
-			 * and save a copy of the command status string to return
-			 * as our result tuple
+			 * and save a copy of the command status string to return as
+			 * our result tuple
 			 */
 			sql_cmd_status = PQcmdStatus(res);
 			funcctx->max_calls = 1;
@@ -707,7 +705,7 @@ dblink_exec(PG_FUNCTION_ARGS)
 	char	   *connstr = NULL;
 	char	   *sql = NULL;
 	char	   *conname = NULL;
-	remoteConn *rcon=NULL;
+	remoteConn *rcon = NULL;
 	bool		freeconn = true;
 
 	if (PG_NARGS() == 2)
@@ -724,7 +722,7 @@ dblink_exec(PG_FUNCTION_ARGS)
 		/* shouldn't happen */
 		elog(ERROR, "wrong number of arguments");
 
-	if(!conn)
+	if (!conn)
 		DBLINK_CONN_NOT_AVAIL;
 
 	res = PQexec(conn, sql);
@@ -741,8 +739,8 @@ dblink_exec(PG_FUNCTION_ARGS)
 						   TEXTOID, -1, 0, false);
 
 		/*
-		 * and save a copy of the command status string to return as
-		 * our result tuple
+		 * and save a copy of the command status string to return as our
+		 * result tuple
 		 */
 		sql_cmd_status = GET_TEXT(PQcmdStatus(res));
 	}
@@ -802,6 +800,7 @@ dblink_get_pkey(PG_FUNCTION_ARGS)
 					(errcode(ERRCODE_UNDEFINED_TABLE),
 					 errmsg("relation \"%s\" does not exist",
 							GET_STR(PG_GETARG_TEXT_P(0)))));
+
 		/*
 		 * need a tuple descriptor representing one INT and one TEXT
 		 * column
@@ -1896,18 +1895,18 @@ getConnectionByName(const char *name)
 	remoteConnHashEnt *hentry;
 	char		key[NAMEDATALEN];
 
-	if(!remoteConnHash)
-		remoteConnHash=createConnHash();
+	if (!remoteConnHash)
+		remoteConnHash = createConnHash();
 
 	MemSet(key, 0, NAMEDATALEN);
 	snprintf(key, NAMEDATALEN - 1, "%s", name);
-	hentry = (remoteConnHashEnt*) hash_search(remoteConnHash,
+	hentry = (remoteConnHashEnt *) hash_search(remoteConnHash,
 											   key, HASH_FIND, NULL);
 
-	if(hentry)
-		return(hentry->rcon);
+	if (hentry)
+		return (hentry->rcon);
 
-	return(NULL);
+	return (NULL);
 }
 
 static HTAB *
@@ -1919,24 +1918,24 @@ createConnHash(void)
 	ctl.keysize = NAMEDATALEN;
 	ctl.entrysize = sizeof(remoteConnHashEnt);
 
-	ptr=hash_create("Remote Con hash", NUMCONN, &ctl, HASH_ELEM);
+	ptr = hash_create("Remote Con hash", NUMCONN, &ctl, HASH_ELEM);
 
-	if(!ptr)
+	if (!ptr)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
 
-	return(ptr);
+	return (ptr);
 }
 
 static void
-createNewConnection(const char *name, remoteConn *con)
+createNewConnection(const char *name, remoteConn * con)
 {
 	remoteConnHashEnt *hentry;
 	bool		found;
 	char		key[NAMEDATALEN];
 
-	if(!remoteConnHash)
+	if (!remoteConnHash)
 		remoteConnHash = createConnHash();
 
 	MemSet(key, 0, NAMEDATALEN);
@@ -1944,12 +1943,12 @@ createNewConnection(const char *name, remoteConn *con)
 	hentry = (remoteConnHashEnt *) hash_search(remoteConnHash, key,
 											   HASH_ENTER, &found);
 
-	if(!hentry)
+	if (!hentry)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
 
-	if(found)
+	if (found)
 		ereport(ERROR,
 				(errcode(ERRCODE_DUPLICATE_OBJECT),
 				 errmsg("duplicate connection name")));
@@ -1965,8 +1964,8 @@ deleteConnection(const char *name)
 	bool		found;
 	char		key[NAMEDATALEN];
 
-	if(!remoteConnHash)
-		remoteConnHash=createConnHash();
+	if (!remoteConnHash)
+		remoteConnHash = createConnHash();
 
 	MemSet(key, 0, NAMEDATALEN);
 	snprintf(key, NAMEDATALEN - 1, "%s", name);
@@ -1974,7 +1973,7 @@ deleteConnection(const char *name)
 	hentry = (remoteConnHashEnt *) hash_search(remoteConnHash,
 											   key, HASH_REMOVE, &found);
 
-	if(!hentry)
+	if (!hentry)
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
 				 errmsg("undefined connection name")));

contrib/dbmirror/pending.c

 /****************************************************************************
  * pending.c
- * $Id: pending.c,v 1.12 2003/07/24 17:52:20 tgl Exp $
+ * $Id: pending.c,v 1.13 2003/08/04 00:43:10 momjian Exp $
  *
  * This file contains a trigger for Postgresql-7.x to record changes to tables
  * to a pending table for mirroring.
@@ -81,6 +81,7 @@ recordchange(PG_FUNCTION_ARGS)
 	char		op = 0;
 	char	   *schemaname;
 	char	   *fullyqualtblname;
+
 	if (fcinfo->context != NULL)
 	{
 
@@ -96,11 +97,11 @@ recordchange(PG_FUNCTION_ARGS)
 		schemaname = get_namespace_name(RelationGetNamespace(trigdata->tg_relation));
 		fullyqualtblname = SPI_palloc(strlen(tblname) +
 									  strlen(schemaname) + 6);
- 		sprintf(fullyqualtblname,"\"%s\".\"%s\"",
-			schemaname,tblname);
+		sprintf(fullyqualtblname, "\"%s\".\"%s\"",
+				schemaname, tblname);
 #else
 		fullyqualtblname = SPI_palloc(strlen(tblname) + 3);
-		sprintf(fullyqualtblname,"\"%s\"",tblname);
+		sprintf(fullyqualtblname, "\"%s\"", tblname);
 #endif
 		tupdesc = trigdata->tg_relation->rd_att;
 		if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
@@ -166,7 +167,7 @@ storePending(char *cpTableName, HeapTuple tBeforeTuple,
 	int			iResult = 0;
 	HeapTuple	tCurTuple;
 
-	//Points the current tuple(before or after)
+	/* Points the current tuple(before or after) */
 	Datum		saPlanData[4];
 	Oid			taPlanArgTypes[3] = {NAMEOID, CHAROID, INT4OID};
 	void	   *vpPlan;
@@ -460,7 +461,7 @@ packageData(HeapTuple tTupleData, TupleDesc tTupleDesc,
 		}
 		else
 		{
-			sprintf(cpFormatedPtr," ");
+			sprintf(cpFormatedPtr, " ");
 			iUsedDataBlock++;
 			cpFormatedPtr++;
 			continue;
@@ -508,7 +509,7 @@ packageData(HeapTuple tTupleData, TupleDesc tTupleDesc,
 	if (tpPKeys != NULL)
 		SPI_pfree(tpPKeys);
 #if defined DEBUG_OUTPUT
-	elog(NOTICE, "returning DataBlockSize:%d iUsedDataBlock:%d",iDataBlockSize,
+	elog(NOTICE, "returning DataBlockSize:%d iUsedDataBlock:%d", iDataBlockSize,
 		 iUsedDataBlock);
 #endif
 	memset(cpDataBlock + iUsedDataBlock, 0, iDataBlockSize - iUsedDataBlock);

contrib/earthdistance/earthdistance.c

@@ -66,9 +66,10 @@ geo_distance(Point *pt1, Point *pt2)
 	if (longdiff > M_PI)
 		longdiff = TWO_PI - longdiff;
 
-        sino = sqrt(sin(fabs(lat1-lat2)/2.)*sin(fabs(lat1-lat2)/2.) +
-                cos(lat1) * cos(lat2) * sin(longdiff/2.)*sin(longdiff/2.));
-        if (sino > 1.) sino = 1.;
+	sino = sqrt(sin(fabs(lat1 - lat2) / 2.) * sin(fabs(lat1 - lat2) / 2.) +
+		cos(lat1) * cos(lat2) * sin(longdiff / 2.) * sin(longdiff / 2.));
+	if (sino > 1.)
+		sino = 1.;
 	*resultp = 2. * EARTH_RADIUS * asin(sino);
 
 	return resultp;

contrib/findoidjoins/findoidjoins.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/findoidjoins.c,v 1.20 2003/05/14 03:25:56 tgl Exp $
+ * $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/findoidjoins.c,v 1.21 2003/08/04 00:43:10 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -24,7 +24,8 @@ main(int argc, char **argv)
 	char	   *fk_attname;
 	char	   *pk_relname;
 	char	   *pk_nspname;
-	int					fk, pk;		/* loop counters */
+	int			fk,
+				pk;				/* loop counters */
 
 	if (argc != 2)
 	{
@@ -95,8 +96,8 @@ main(int argc, char **argv)
 	fkrel_res = res;
 
 	/*
-	 * For each column and each relation-having-OIDs, look to see if
-	 * the column contains any values matching entries in the relation.
+	 * For each column and each relation-having-OIDs, look to see if the
+	 * column contains any values matching entries in the relation.
 	 */
 
 	for (fk = 0; fk < PQntuples(fkrel_res); fk++)

contrib/intagg/int_aggregate.c

@@ -132,9 +132,9 @@ ShrinkPGArray(PGARRAY * p)
 
 		/* use current transaction context */
 		pnew = palloc(cb);
+
 		/*
-		 * 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;

contrib/intarray/_int.h

@@ -126,8 +126,8 @@ ArrayType *intarray_concat_arrays(ArrayType *a, ArrayType *b);
 ArrayType  *int_to_intset(int32 elem);
 bool		inner_int_overlap(ArrayType *a, ArrayType *b);
 bool		inner_int_contains(ArrayType *a, ArrayType *b);
-ArrayType * inner_int_union(ArrayType *a, ArrayType *b);
-ArrayType * inner_int_inter(ArrayType *a, ArrayType *b);
+ArrayType  *inner_int_union(ArrayType *a, ArrayType *b);
+ArrayType  *inner_int_inter(ArrayType *a, ArrayType *b);
 void		rt__int_size(ArrayType *a, float *size);
 void		gensign(BITVEC sign, int *a, int len);
 
@@ -173,5 +173,3 @@ int compDESC(const void *a, const void *b);
 if (ARRNELEMS(a) > 1)											\
 		qsort((void*)ARRPTR(a), ARRNELEMS(a),sizeof(int4),		\
 				(direction) ? compASC : compDESC )
-
-

contrib/intarray/_int_bool.c

@@ -743,4 +743,3 @@ querytree(PG_FUNCTION_ARGS)
 
 	PG_RETURN_POINTER(res);
 }
-

contrib/intarray/_int_gist.c

@@ -85,26 +85,30 @@ g_int_consistent(PG_FUNCTION_ARGS)
 }
 
 Datum
-g_int_union(PG_FUNCTION_ARGS) {
+g_int_union(PG_FUNCTION_ARGS)
+{
 	bytea	   *entryvec = (bytea *) PG_GETARG_POINTER(0);
 	int		   *size = (int *) PG_GETARG_POINTER(1);
-	int4            i,len = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
+	int4		i,
+				len = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
 	ArrayType  *res;
-	int totlen=0,*ptr;
+	int			totlen = 0,
+			   *ptr;
 
 	for (i = 0; i < len; i++)
-		totlen+=ARRNELEMS( GETENTRY(entryvec,i) );
+		totlen += ARRNELEMS(GETENTRY(entryvec, i));
 
-	res=new_intArrayType(totlen);
-	ptr=ARRPTR(res);
+	res = new_intArrayType(totlen);
+	ptr = ARRPTR(res);
 
-	for (i = 0; i < len; i++) {
-		memcpy(ptr, ARRPTR( GETENTRY(entryvec,i) ), ARRNELEMS( GETENTRY(entryvec,i) )*sizeof(int4) );
-		ptr+=ARRNELEMS( GETENTRY(entryvec,i) );
+	for (i = 0; i < len; i++)
+	{
+		memcpy(ptr, ARRPTR(GETENTRY(entryvec, i)), ARRNELEMS(GETENTRY(entryvec, i)) * sizeof(int4));
+		ptr += ARRNELEMS(GETENTRY(entryvec, i));
 	}
 
-	QSORT(res,1);
-	res=_int_unique(res);
+	QSORT(res, 1);
+	res = _int_unique(res);
 	*size = VARSIZE(res);
 	PG_RETURN_POINTER(res);
 }
@@ -239,7 +243,8 @@ g_int_decompress(PG_FUNCTION_ARGS)
 ** The GiST Penalty method for _intments
 */
 Datum
-g_int_penalty(PG_FUNCTION_ARGS) {
+g_int_penalty(PG_FUNCTION_ARGS)
+{
 	GISTENTRY  *origentry = (GISTENTRY *) PG_GETARG_POINTER(0);
 	GISTENTRY  *newentry = (GISTENTRY *) PG_GETARG_POINTER(1);
 	float	   *result = (float *) PG_GETARG_POINTER(2);
@@ -254,7 +259,7 @@ g_int_penalty(PG_FUNCTION_ARGS) {
 	*result = tmp1 - tmp2;
 	pfree(ud);
 
-	PG_RETURN_POINTER (result);
+	PG_RETURN_POINTER(result);
 }
 
 
@@ -311,7 +316,8 @@ comparecost(const void *a, const void *b)
 ** We use Guttman's poly time split algorithm
 */
 Datum
-g_int_picksplit(PG_FUNCTION_ARGS) {
+g_int_picksplit(PG_FUNCTION_ARGS)
+{
 	bytea	   *entryvec = (bytea *) PG_GETARG_POINTER(0);
 	GIST_SPLITVEC *v = (GIST_SPLITVEC *) PG_GETARG_POINTER(1);
 	OffsetNumber i,
@@ -501,4 +507,3 @@ g_int_picksplit(PG_FUNCTION_ARGS) {
 
 	PG_RETURN_POINTER(v);
 }
-

contrib/intarray/_int_tool.c

@@ -270,7 +270,7 @@ _int_unique(ArrayType *r)
 			   *data;
 	int			num = ARRNELEMS(r);
 
-	if ( num<2 )
+	if (num < 2)
 		return r;
 
 	data = tmp = dr = ARRPTR(r);
@@ -367,4 +367,3 @@ compDESC(const void *a, const void *b)
 		return 0;
 	return (*(int4 *) a < *(int4 *) b) ? 1 : -1;
 }
-

contrib/ltree/_ltree_op.c

@@ -144,13 +144,15 @@ _lt_q_regex(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("array must be one-dimensional")));
 
-        while (num > 0) {
-		if ( array_iterator(_tree, ltq_regex, (void*)query, NULL) ) {
+	while (num > 0)
+	{
+		if (array_iterator(_tree, ltq_regex, (void *) query, NULL))
+		{
 			res = true;
 			break;
 		}
 		num--;
-                query = (lquery*)NEXTVAL(query);
+		query = (lquery *) NEXTVAL(query);
 	}
 
 	PG_FREE_IF_COPY(_tree, 0);

contrib/ltree/lquery_op.c

@@ -45,7 +45,7 @@ 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)
+			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;
@@ -123,10 +123,15 @@ printFieldNot(FieldNot *fn ) {
 }
 */
 
-static struct {
+static struct
+{
 	bool		muse;
 	uint32		high_pos;
-} SomeStack = {false,0,};
+}	SomeStack =
+
+{
+	false, 0,
+};
 
 static bool
 checkCond(lquery_level * curq, int query_numlevel, ltree_level * curt, int tree_numlevel, FieldNot * ptr)
@@ -140,7 +145,8 @@ checkCond(lquery_level * curq, int query_numlevel, ltree_level * curt, int tree_
 	lquery_level *prevq = NULL;
 	ltree_level *prevt = NULL;
 
-	if ( SomeStack.muse ) {
+	if (SomeStack.muse)
+	{
 		high_pos = SomeStack.high_pos;
 		qlen--;
 		prevq = curq;
@@ -200,13 +206,15 @@ checkCond(lquery_level * curq, int query_numlevel, ltree_level * curt, int tree_
 					curt = LEVEL_NEXT(curt);
 					tlen--;
 					cur_tpos++;
-					if ( isok && prevq && prevq->numvar==0 && tlen>0 && cur_tpos <= high_pos ) {
+					if (isok && prevq && prevq->numvar == 0 && tlen > 0 && cur_tpos <= high_pos)
+					{
 						FieldNot	tmpptr;
-						if ( ptr )
-							memcpy(&tmpptr,ptr,sizeof(FieldNot));
-						SomeStack.high_pos = high_pos-cur_tpos;
+
+						if (ptr)
+							memcpy(&tmpptr, ptr, sizeof(FieldNot));
+						SomeStack.high_pos = high_pos - cur_tpos;
 						SomeStack.muse = true;
-						if ( checkCond(prevq, qlen+1, curt, tlen, (ptr) ? &tmpptr : NULL) )
+						if (checkCond(prevq, qlen + 1, curt, tlen, (ptr) ? &tmpptr : NULL))
 							return true;
 					}
 					if (!isok && ptr)
@@ -321,9 +329,11 @@ lt_q_regex(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
 				 errmsg("array must be one-dimensional")));
 
-	while (num > 0) {
+	while (num > 0)
+	{
 		if (DatumGetBool(DirectFunctionCall2(ltq_regex,
-				PointerGetDatum(tree), PointerGetDatum(query)))) {
+						 PointerGetDatum(tree), PointerGetDatum(query))))
+		{
 
 			res = true;
 			break;
@@ -345,5 +355,3 @@ lt_q_rregex(PG_FUNCTION_ARGS)
 										PG_GETARG_DATUM(0)
 										));
 }
-
-

contrib/ltree/ltree_op.c

@@ -331,46 +331,55 @@ ltree_index(PG_FUNCTION_ARGS)
 {
 	ltree	   *a = PG_GETARG_LTREE(0);
 	ltree	   *b = PG_GETARG_LTREE(1);
-	int	start=(fcinfo->nargs == 3) ? PG_GETARG_INT32(2) : 0;
-	int i,j;
-	ltree_level *startptr, *aptr, *bptr;
-	bool found=false;
-
-	if ( start < 0 ) {
-		if ( -start >= a->numlevel ) 
-			start=0;
+	int			start = (fcinfo->nargs == 3) ? PG_GETARG_INT32(2) : 0;
+	int			i,
+				j;
+	ltree_level *startptr,
+			   *aptr,
+			   *bptr;
+	bool		found = false;
+
+	if (start < 0)
+	{
+		if (-start >= a->numlevel)
+			start = 0;
 		else
-			start = (int)(a->numlevel)+start;
+			start = (int) (a->numlevel) + start;
 	}
 
-	if ( a->numlevel - start < b->numlevel || a->numlevel==0 || b->numlevel==0 ) {
+	if (a->numlevel - start < b->numlevel || a->numlevel == 0 || b->numlevel == 0)
+	{
 		PG_FREE_IF_COPY(a, 0);
 		PG_FREE_IF_COPY(b, 1);
 		PG_RETURN_INT32(-1);
 	}
 
-	startptr=LTREE_FIRST(a);
-	for(i=0; i<=a->numlevel-b->numlevel; i++) {
-		if ( i>=start ) {
-			aptr=startptr;
-			bptr=LTREE_FIRST(b);
-			for(j=0;j<b->numlevel;j++) {
-				if ( !(aptr->len==bptr->len && strncmp(aptr->name,bptr->name, aptr->len)==0) )
+	startptr = LTREE_FIRST(a);
+	for (i = 0; i <= a->numlevel - b->numlevel; i++)
+	{
+		if (i >= start)
+		{
+			aptr = startptr;
+			bptr = LTREE_FIRST(b);
+			for (j = 0; j < b->numlevel; j++)
+			{
+				if (!(aptr->len == bptr->len && strncmp(aptr->name, bptr->name, aptr->len) == 0))
 					break;
-				aptr=LEVEL_NEXT(aptr);
-				bptr=LEVEL_NEXT(bptr);
+				aptr = LEVEL_NEXT(aptr);
+				bptr = LEVEL_NEXT(bptr);
 			}
 
-			if ( j==b->numlevel ) {
-				found=true;
+			if (j == b->numlevel)
+			{
+				found = true;
 				break;
 			}
 		}
-		startptr=LEVEL_NEXT(startptr);	
+		startptr = LEVEL_NEXT(startptr);
 	}
 
-	if ( !found ) 
-		i=-1;
+	if (!found)
+		i = -1;
 
 	PG_FREE_IF_COPY(a, 0);
 	PG_FREE_IF_COPY(b, 1);
@@ -507,7 +516,7 @@ text2ltree(PG_FUNCTION_ARGS)
 														PointerGetDatum(s)
 														));
 	pfree(s);
-	PG_FREE_IF_COPY(in,0);
+	PG_FREE_IF_COPY(in, 0);
 	PG_RETURN_POINTER(out);
 }
 
@@ -521,11 +530,13 @@ ltree2text(PG_FUNCTION_ARGS)
 	ltree_level *curlevel;
 	text	   *out;
 
-	out=(text*)palloc(in->len+VARHDRSZ);
+	out = (text *) palloc(in->len + VARHDRSZ);
 	ptr = VARDATA(out);
 	curlevel = LTREE_FIRST(in);
-	for (i = 0; i < in->numlevel; i++) {
-		if (i != 0) {
+	for (i = 0; i < in->numlevel; i++)
+	{
+		if (i != 0)
+		{
 			*ptr = '.';
 			ptr++;
 		}
@@ -534,12 +545,8 @@ ltree2text(PG_FUNCTION_ARGS)
 		curlevel = LEVEL_NEXT(curlevel);
 	}
 
-	VARATT_SIZEP(out) = VARHDRSZ + (ptr-VARDATA(out)); 
+	VARATT_SIZEP(out) = VARHDRSZ + (ptr - VARDATA(out));
 	PG_FREE_IF_COPY(in, 0);
 
 	PG_RETURN_POINTER(out);
 }
-
-	
-
-

contrib/pg_autovacuum/pg_autovacuum.h

@@ -44,9 +44,19 @@
 /* define cmd_args stucture */
 struct cmdargs
 {
-  int vacuum_base_threshold, analyze_base_threshold, sleep_base_value, debug, daemonize;
-  float vacuum_scaling_factor, analyze_scaling_factor, sleep_scaling_factor;
-  char *user, *password, *host, *logfile, *port;
+	int			vacuum_base_threshold,
+				analyze_base_threshold,
+				sleep_base_value,
+				debug,
+				daemonize;
+	float		vacuum_scaling_factor,
+				analyze_scaling_factor,
+				sleep_scaling_factor;
+	char	   *user,
+			   *password,
+			   *host,
+			   *logfile,
+			   *port;
 };
 typedef struct cmdargs cmd_args;
 
@@ -57,58 +67,73 @@ cmd_args *args;
 	I think we need to guarantee this happens approx every 1Million TX's  */
 struct dbinfo
 {
-  int oid, age;
-  int analyze_threshold, vacuum_threshold;	/* Use these as defaults for table thresholds */
+	int			oid,
+				age;
+	int			analyze_threshold,
+				vacuum_threshold;		/* Use these as defaults for table
+										 * thresholds */
 	PGconn	   *conn;
-  char *dbname, *username, *password;
+	char	   *dbname,
+			   *username,
+			   *password;
 	Dllist	   *table_list;
 };
 typedef struct dbinfo db_info;
 
 struct tableinfo
 {
-  char *schema_name, *table_name;
-  int  relfilenode, reltuples, relpages;
-  long analyze_threshold, vacuum_threshold;
-  long CountAtLastAnalyze;	/* equal to: inserts + updates as of the last analyze or initial values at startup */
-  long CountAtLastVacuum;	/* equal to: deletes + updates as of the last vacuum or initial values at startup */
-  long curr_analyze_count, curr_vacuum_count; /* Latest values from stats system */
-  db_info *dbi; /* pointer to the database that this table belongs to */
+	char	   *schema_name,
+			   *table_name;
+	int			relfilenode,
+				reltuples,
+				relpages;
+	long		analyze_threshold,
+				vacuum_threshold;
+	long		CountAtLastAnalyze;		/* equal to: inserts + updates as
+										 * of the last analyze or initial
+										 * values at startup */
+	long		CountAtLastVacuum;		/* equal to: deletes + updates as
+										 * of the last vacuum or initial
+										 * values at startup */
+	long		curr_analyze_count,
+				curr_vacuum_count;		/* Latest values from stats system */
+	db_info    *dbi;			/* pointer to the database that this table
+								 * belongs to */
 };
 typedef struct tableinfo tbl_info;
 
 /* Functions for dealing with command line arguements */
-static cmd_args *get_cmd_args (int argc, char *argv[]);
-static void print_cmd_args (void);
-static void free_cmd_args (void);
-static void usage (void);
+static cmd_args *get_cmd_args(int argc, char *argv[]);
+static void print_cmd_args(void);
+static void free_cmd_args(void);
+static void usage(void);
 
 /* Functions for managing database lists */
-static Dllist *init_db_list (void);
-static db_info *init_dbinfo (char *dbname, int oid, int age);
-static void update_db_list (Dllist * db_list);
-static void remove_db_from_list (Dlelem * db_to_remove);
-static void print_db_info (db_info * dbi, int print_table_list);
-static void print_db_list (Dllist * db_list, int print_table_lists);
-static int xid_wraparound_check (db_info * dbi);
-static void free_db_list (Dllist * db_list);
+static Dllist *init_db_list(void);
+static db_info *init_dbinfo(char *dbname, int oid, int age);
+static void update_db_list(Dllist *db_list);
+static void remove_db_from_list(Dlelem *db_to_remove);
+static void print_db_info(db_info * dbi, int print_table_list);
+static void print_db_list(Dllist *db_list, int print_table_lists);
+static int	xid_wraparound_check(db_info * dbi);
+static void free_db_list(Dllist *db_list);
 
 /* Functions for managing table lists */
-static tbl_info *init_table_info (PGresult * conn, int row, db_info *dbi);
-static void update_table_list (db_info * dbi);
-static void remove_table_from_list (Dlelem * tbl_to_remove);
-static void print_table_list (Dllist * tbl_node);
-static void print_table_info (tbl_info * tbl);
-static void update_table_thresholds (db_info * dbi, tbl_info * tbl, int vacuum_type);
-static void free_tbl_list (Dllist * tbl_list);
+static tbl_info *init_table_info(PGresult *conn, int row, db_info * dbi);
+static void update_table_list(db_info * dbi);
+static void remove_table_from_list(Dlelem *tbl_to_remove);
+static void print_table_list(Dllist *tbl_node);
+static void print_table_info(tbl_info * tbl);
+static void update_table_thresholds(db_info * dbi, tbl_info * tbl, int vacuum_type);
+static void free_tbl_list(Dllist *tbl_list);
 
 /* A few database helper functions */
-static int check_stats_enabled (db_info * dbi);
-static PGconn *db_connect (db_info * dbi);
-static void db_disconnect (db_info * dbi);
-static PGresult *send_query (const char *query, db_info * dbi);
-static char *query_table_stats (db_info * dbi);
+static int	check_stats_enabled(db_info * dbi);
+static PGconn *db_connect(db_info * dbi);
+static void db_disconnect(db_info * dbi);
+static PGresult *send_query(const char *query, db_info * dbi);
+static char *query_table_stats(db_info * dbi);
 
 /* Other Generally needed Functions */
 static void daemonize(void);
-static void log_entry (const char *logentry);
+static void log_entry(const char *logentry);

contrib/pg_dumplo/main.c

 /* -------------------------------------------------------------------------
  * pg_dumplo
  *
- * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/main.c,v 1.16 2003/05/14 03:25:56 tgl Exp $
+ * $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/main.c,v 1.17 2003/08/04 00:43:11 momjian Exp $
  *
  *					Karel Zak 1999-2000
  * -------------------------------------------------------------------------

contrib/pgbench/pgbench.c

 /*
- * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.25 2003/08/01 02:21:17 tgl Exp $
+ * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.26 2003/08/04 00:43:11 momjian Exp $
  *
  * pgbench: a simple TPC-B like benchmark program for PostgreSQL
  * written by Tatsuo Ishii

contrib/pgcrypto/openssl.c

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: openssl.c,v 1.11 2002/11/15 02:54:44 momjian Exp $
+ * $Id: openssl.c,v 1.12 2003/08/04 00:43:11 momjian Exp $
  */
 
 #include <postgres.h>
@@ -134,7 +134,8 @@ px_find_digest(const char *name, PX_MD ** res)
  * So need to manage ciphers ourselves.
  */
 
-struct ossl_cipher {
+struct ossl_cipher
+{
 	int			(*init) (PX_Cipher * c, const uint8 *key, unsigned klen, const uint8 *iv);
 	int			(*encrypt) (PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res);
 	int			(*decrypt) (PX_Cipher * c, const uint8 *data, unsigned dlen, uint8 *res);
@@ -311,8 +312,8 @@ ossl_des_ecb_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen,
 	ossldata   *od = c->ptr;
 
 	for (i = 0; i < dlen / bs; i++)
-		des_ecb_encrypt((des_cblock*)(data + i * bs),
-				(des_cblock*)(res + i * bs),
+		des_ecb_encrypt((des_cblock *) (data + i * bs),
+						(des_cblock *) (res + i * bs),
 						od->u.des.key_schedule, 1);
 	return 0;
 }
@@ -326,8 +327,8 @@ ossl_des_ecb_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen,
 	ossldata   *od = c->ptr;
 
 	for (i = 0; i < dlen / bs; i++)
-		des_ecb_encrypt((des_cblock*)(data + i * bs),
-				(des_cblock*)(res + i * bs),
+		des_ecb_encrypt((des_cblock *) (data + i * bs),
+						(des_cblock *) (res + i * bs),
 						od->u.des.key_schedule, 0);
 	return 0;
 }
@@ -339,7 +340,7 @@ ossl_des_cbc_encrypt(PX_Cipher * c, const uint8 *data, unsigned dlen,
 	ossldata   *od = c->ptr;
 
 	des_ncbc_encrypt(data, res, dlen, od->u.des.key_schedule,
-			(des_cblock*)od->iv, 1);
+					 (des_cblock *) od->iv, 1);
 	return 0;
 }
 
@@ -350,7 +351,7 @@ ossl_des_cbc_decrypt(PX_Cipher * c, const uint8 *data, unsigned dlen,
 	ossldata   *od = c->ptr;
 
 	des_ncbc_encrypt(data, res, dlen, od->u.des.key_schedule,
-			(des_cblock*)od->iv, 0);
+					 (des_cblock *) od->iv, 0);
 	return 0;
 }
 
@@ -429,37 +430,37 @@ static PX_Alias ossl_aliases[] = {
 
 static const struct ossl_cipher ossl_bf_cbc = {
 	bf_init, bf_cbc_encrypt, bf_cbc_decrypt,
-	64/8, 448/8, 0
+	64 / 8, 448 / 8, 0
 };
 
 static const struct ossl_cipher ossl_bf_ecb = {
 	bf_init, bf_ecb_encrypt, bf_ecb_decrypt,
-	64/8, 448/8, 0
+	64 / 8, 448 / 8, 0
 };
 
 static const struct ossl_cipher ossl_bf_cfb = {
 	bf_init, bf_cfb64_encrypt, bf_cfb64_decrypt,
-	64/8, 448/8, 1
+	64 / 8, 448 / 8, 1
 };
 
 static const struct ossl_cipher ossl_des_ecb = {
 	ossl_des_init, ossl_des_ecb_encrypt, ossl_des_ecb_decrypt,
-	64/8, 64/8, 0
+	64 / 8, 64 / 8, 0
 };
 
 static const struct ossl_cipher ossl_des_cbc = {
 	ossl_des_init, ossl_des_cbc_encrypt, ossl_des_cbc_decrypt,
-	64/8, 64/8, 0
+	64 / 8, 64 / 8, 0
 };
 
 static const struct ossl_cipher ossl_cast_ecb = {
 	ossl_cast_init, ossl_cast_ecb_encrypt, ossl_cast_ecb_decrypt,
-	64/8, 128/8, 0
+	64 / 8, 128 / 8, 0
 };
 
 static const struct ossl_cipher ossl_cast_cbc = {
 	ossl_cast_init, ossl_cast_cbc_encrypt, ossl_cast_cbc_decrypt,
-	64/8, 128/8, 0
+	64 / 8, 128 / 8, 0
 };
 
 /*
@@ -510,8 +511,10 @@ px_find_cipher(const char *name, PX_Cipher ** res)
 	const struct ossl_cipher *ossl_ciph = NULL;
 
 	name = px_resolve_alias(ossl_aliases, name);
-	for (i = 0; ossl_cipher_types[i].name; i++) {
-		if (!strcmp(ossl_cipher_types[i].name, name)) {
+	for (i = 0; ossl_cipher_types[i].name; i++)
+	{
+		if (!strcmp(ossl_cipher_types[i].name, name))
+		{
 			ossl_ciph = ossl_cipher_types[i].ciph;
 			break;
 		}

contrib/pgcrypto/pgcrypto.c

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: pgcrypto.c,v 1.13 2003/07/24 17:52:33 tgl Exp $
+ * $Id: pgcrypto.c,v 1.14 2003/08/04 00:43:11 momjian Exp $
  */
 
 #include <postgres.h>

contrib/pgstattuple/pgstattuple.c

 /*
- * $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.11 2003/08/01 02:21:17 tgl Exp $
+ * $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.12 2003/08/04 00:43:11 momjian Exp $
  *
  * Copyright (c) 2001,2002	Tatsuo Ishii
  *
@@ -221,5 +221,5 @@ pgstattuple_real(Relation rel)
 		pfree(values[i]);
 	pfree(values);
 
-	return(result);
+	return (result);
 }

contrib/tablefunc/tablefunc.c

@@ -729,9 +729,9 @@ crosstab_hash(PG_FUNCTION_ARGS)
 	/*
 	 * Check to make sure we have a reasonable tuple descriptor
 	 *
-	 * Note we will attempt to coerce the values into whatever
-	 * the return attribute type is and depend on the "in"
-	 * function to complain if needed.
+	 * Note we will attempt to coerce the values into whatever the return
+	 * attribute type is and depend on the "in" function to complain if
+	 * needed.
 	 */
 	if (tupdesc->natts < 2)
 		ereport(ERROR,
@@ -781,8 +781,8 @@ load_categories_hash(char *cats_sql, MemoryContext per_query_ctx)
 	ctl.entrysize = sizeof(crosstab_HashEnt);
 
 	/*
-	 * use INIT_CATS, defined above as a guess of how
-	 * many hash table entries to create, initially
+	 * use INIT_CATS, defined above as a guess of how many hash table
+	 * entries to create, initially
 	 */
 	crosstab_HashTable = hash_create("crosstab hash", INIT_CATS, &ctl, HASH_ELEM);
 
@@ -803,8 +803,8 @@ load_categories_hash(char *cats_sql, MemoryContext per_query_ctx)
 		int			i;
 
 		/*
-		 * The provided categories SQL query must always return one column:
-		 * category - the label or identifier for each column
+		 * The provided categories SQL query must always return one
+		 * column: category - the label or identifier for each column
 		 */
 		if (spi_tupdesc->natts != 1)
 			ereport(ERROR,
@@ -890,21 +890,24 @@ get_crosstab_tuplestore(char *sql,
 		int			ncols = spi_tupdesc->natts;
 		char	   *rowid;
 		char	   *lastrowid = NULL;
-		int				i, j;
+		int			i,
+					j;
 		int			result_ncols;
 
 		/*
-		 * The provided SQL query must always return at least three columns:
+		 * The provided SQL query must always return at least three
+		 * columns:
 		 *
 		 * 1. rowname	the label for each row - column 1 in the final result
-		 * 2. category  the label for each value-column in the final result
-		 * 3. value		the values used to populate the value-columns
+		 * 2. category	the label for each value-column in the final
+		 * result 3. value	   the values used to populate the
+		 * value-columns
 		 *
 		 * If there are more than three columns, the last two are taken as
-		 * "category" and "values". The first column is taken as "rowname".
-		 * Additional columns (2 thru N-2) are assumed the same for the same
-		 * "rowname", and are copied into the result tuple from the first
-		 * time we encounter a particular rowname.
+		 * "category" and "values". The first column is taken as
+		 * "rowname". Additional columns (2 thru N-2) are assumed the same
+		 * for the same "rowname", and are copied into the result tuple
+		 * from the first time we encounter a particular rowname.
 		 */
 		if (ncols < 3)
 			ereport(ERROR,
@@ -958,7 +961,10 @@ get_crosstab_tuplestore(char *sql,
 				 */
 				if (lastrowid != NULL)
 				{
-					/* switch to appropriate context while storing the tuple */
+					/*
+					 * switch to appropriate context while storing the
+					 * tuple
+					 */
 					SPIcontext = MemoryContextSwitchTo(per_query_ctx);
 
 					/* rowid changed, flush the previous output row */
@@ -1309,7 +1315,7 @@ build_tuplestore_recursively(char *key_fld,
 						 parent_key_fld,
 						 start_with,
 						 key_fld);
-					 serial_column=0;
+		serial_column = 0;
 	}
 	else
 	{
@@ -1321,7 +1327,7 @@ build_tuplestore_recursively(char *key_fld,
 						 start_with,
 						 key_fld,
 						 orderby_fld);
-					 serial_column=1;
+		serial_column = 1;
 	}
 
 	/* Retrieve the desired rows */
@@ -1508,10 +1514,10 @@ build_tuplestore_recursively(char *key_fld,
 static void
 validateConnectbyTupleDesc(TupleDesc tupdesc, bool show_branch, bool show_serial)
 {
-	int serial_column=0;
+	int			serial_column = 0;
 
 	if (show_serial)
-		serial_column=1;
+		serial_column = 1;
 
 	/* are there the correct number of columns */
 	if (show_branch)

contrib/tsearch/morph.c

@@ -51,7 +51,8 @@ DICT		dicts[] = {
 #undef DICT_TABLE
 
 /* array for storing dictionary's objects (if needed) */
-void	   *dictobjs[lengthof(dicts)];
+void	   *dictobjs[
+					 lengthof(dicts)];
 
 #define STOPLEXEM	-2
 #define BYLOCALE	-1

contrib/tsearch2/common.c

@@ -4,54 +4,72 @@
 #include "ts_cfg.h"
 #include "dict.h"
 
-text* 
-char2text(char* in) {
+text *
+char2text(char *in)
+{
 	return charl2text(in, strlen(in));
 }
 
-text* charl2text(char* in, int len) {
-	text *out=(text*)palloc(len+VARHDRSZ);
+text *
+charl2text(char *in, int len)
+{
+	text	   *out = (text *) palloc(len + VARHDRSZ);
+
 	memcpy(VARDATA(out), in, len);
-	VARATT_SIZEP(out) = len+VARHDRSZ;
+	VARATT_SIZEP(out) = len + VARHDRSZ;
 	return out;
 }
 
 char
-*text2char(text* in) {
-        char *out=palloc( VARSIZE(in) );
-        memcpy(out, VARDATA(in), VARSIZE(in)-VARHDRSZ);
-        out[ VARSIZE(in)-VARHDRSZ ] ='\0';
+		   *
+text2char(text *in)
+{
+	char	   *out = palloc(VARSIZE(in));
+
+	memcpy(out, VARDATA(in), VARSIZE(in) - VARHDRSZ);
+	out[VARSIZE(in) - VARHDRSZ] = '\0';
 	return out;
 }
 
 char
-*pnstrdup(char* in, int len) {
-	char *out=palloc( len+1 );
+		   *
+pnstrdup(char *in, int len)
+{
+	char	   *out = palloc(len + 1);
+
 	memcpy(out, in, len);
-	out[len]='\0';
+	out[len] = '\0';
 	return out;
 }
 
 text
-*ptextdup(text* in) {
-	text *out=(text*)palloc( VARSIZE(in) );
-	memcpy(out,in,VARSIZE(in));
+		   *
+ptextdup(text *in)
+{
+	text	   *out = (text *) palloc(VARSIZE(in));
+
+	memcpy(out, in, VARSIZE(in));
 	return out;
 }
 
 text
-*mtextdup(text* in) {
-	text *out=(text*)malloc( VARSIZE(in) );
-	if ( !out ) 
+		   *
+mtextdup(text *in)
+{
+	text	   *out = (text *) malloc(VARSIZE(in));
+
+	if (!out)
 		ts_error(ERROR, "No memory");
-	memcpy(out,in,VARSIZE(in));
+	memcpy(out, in, VARSIZE(in));
 	return out;
 }
 
 void
-ts_error(int state, const char *format, ...) {
+ts_error(int state, const char *format,...)
+{
 	va_list		args;
-	int tlen = 128, len=0;
+	int			tlen = 128,
+				len = 0;
 	char	   *buf;
 
 	reset_cfg();
@@ -60,11 +78,12 @@ ts_error(int state, const char *format, ...) {
 
 	va_start(args, format);
 	buf = palloc(tlen);
-	len = vsnprintf(buf, tlen-1, format, args);
-	if ( len >= tlen ) {
-		tlen=len+1;
-		buf = repalloc( buf, tlen );
-		vsnprintf(buf, tlen-1, format, args);
+	len = vsnprintf(buf, tlen - 1, format, args);
+	if (len >= tlen)
+	{
+		tlen = len + 1;
+		buf = repalloc(buf, tlen);
+		vsnprintf(buf, tlen - 1, format, args);
 	}
 	va_end(args);
 
@@ -74,10 +93,10 @@ ts_error(int state, const char *format, ...) {
 }
 
 int
-text_cmp(text *a, text *b) {
-	if ( VARSIZE(a) == VARSIZE(b) )
-		return strncmp( VARDATA(a), VARDATA(b), VARSIZE(a)-VARHDRSZ );
-	return (int)VARSIZE(a) - (int)VARSIZE(b);
+text_cmp(text *a, text *b)
+{
+	if (VARSIZE(a) == VARSIZE(b))
+		return strncmp(VARDATA(a), VARDATA(b), VARSIZE(a) - VARHDRSZ);
+	return (int) VARSIZE(a) - (int) VARSIZE(b);
 
 }
-

contrib/tsearch2/common.h

@@ -7,18 +7,18 @@
 #define PG_NARGS() (fcinfo->nargs)
 #endif
 
-text* char2text(char* in);
-text* charl2text(char* in, int len);
-char	*text2char(text* in);
-char	*pnstrdup(char* in, int len);
-text	*ptextdup(text* in);
-text	*mtextdup(text* in);
+text	   *char2text(char *in);
+text	   *charl2text(char *in, int len);
+char	   *text2char(text *in);
+char	   *pnstrdup(char *in, int len);
+text	   *ptextdup(text *in);
+text	   *mtextdup(text *in);
 
 int			text_cmp(text *a, text *b);
 
 #define NEXTVAL(x) ( (text*)( (char*)(x) + INTALIGN( VARSIZE(x) ) ) )
 #define ARRNELEMS(x)  ArrayGetNItems( ARR_NDIM(x), ARR_DIMS(x))
 
-void ts_error(int state, const char *format, ...);
+void		ts_error(int state, const char *format,...);
 
 #endif

contrib/tsearch2/dict.c

@@ -19,45 +19,52 @@
 
 /*********top interface**********/
 
-static void *plan_getdict=NULL;
+static void *plan_getdict = NULL;
 
 void
-init_dict(Oid id, DictInfo *dict) {
-	Oid arg[1]={ OIDOID };
+init_dict(Oid id, DictInfo * dict)
+{
+	Oid			arg[1] = {OIDOID};
 	bool		isnull;
-	Datum pars[1]={ ObjectIdGetDatum(id) };
+	Datum		pars[1] = {ObjectIdGetDatum(id)};
 	int			stat;
 
-	memset(dict,0,sizeof(DictInfo));
+	memset(dict, 0, sizeof(DictInfo));
 	SPI_connect();
-	if ( !plan_getdict ) {
-		plan_getdict = SPI_saveplan( SPI_prepare( "select dict_init, dict_initoption, dict_lexize from pg_ts_dict where oid = $1" , 1, arg ) );
-		if ( !plan_getdict ) 
+	if (!plan_getdict)
+	{
+		plan_getdict = SPI_saveplan(SPI_prepare("select dict_init, dict_initoption, dict_lexize from pg_ts_dict where oid = $1", 1, arg));
+		if (!plan_getdict)
 			ts_error(ERROR, "SPI_prepare() failed");
 	}
 
 	stat = SPI_execp(plan_getdict, pars, " ", 1);
-	if ( stat < 0 )
-		ts_error (ERROR, "SPI_execp return %d", stat);
-	if ( SPI_processed > 0 ) {
+	if (stat < 0)
+		ts_error(ERROR, "SPI_execp return %d", stat);
+	if (SPI_processed > 0)
+	{
 		Datum		opt;
-		Oid	oid=InvalidOid;
-		oid=DatumGetObjectId( SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull) );
-		if ( !(isnull || oid==InvalidOid) ) {
-			opt=SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 2, &isnull);
-			dict->dictionary=(void*)DatumGetPointer(OidFunctionCall1(oid, opt)); 
+		Oid			oid = InvalidOid;
+
+		oid = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
+		if (!(isnull || oid == InvalidOid))
+		{
+			opt = SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 2, &isnull);
+			dict->dictionary = (void *) DatumGetPointer(OidFunctionCall1(oid, opt));
 		}
-		oid=DatumGetObjectId( SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 3, &isnull) );
-		if ( isnull || oid==InvalidOid ) 
+		oid = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 3, &isnull));
+		if (isnull || oid == InvalidOid)
 			ts_error(ERROR, "Null dict_lexize for dictonary %d", id);
 		fmgr_info_cxt(oid, &(dict->lexize_info), TopMemoryContext);
-		dict->dict_id=id;
-	} else 
+		dict->dict_id = id;
+	}
+	else
 		ts_error(ERROR, "No dictionary with id %d", id);
 	SPI_finish();
 }
 
-typedef struct {
+typedef struct
+{
 	DictInfo   *last_dict;
 	int			len;
 	int			reallen;
@@ -65,86 +72,95 @@ typedef struct {
 	SNMap		name2id_map;
 }	DictList;
 
-static DictList DList = {NULL,0,0,NULL,{0,0,NULL}};
+static DictList DList = {NULL, 0, 0, NULL, {0, 0, NULL}};
 
 void
-reset_dict(void) {
-	freeSNMap( &(DList.name2id_map) );
+reset_dict(void)
+{
+	freeSNMap(&(DList.name2id_map));
 	/* XXX need to free DList.list[*].dictionary */
-	if ( DList.list )
+	if (DList.list)
 		free(DList.list);
-	memset(&DList,0,sizeof(DictList));
+	memset(&DList, 0, sizeof(DictList));
 }
 
 
 static int
-comparedict(const void *a, const void *b) {
-	return ((DictInfo*)a)->dict_id - ((DictInfo*)b)->dict_id;
+comparedict(const void *a, const void *b)
+{
+	return ((DictInfo *) a)->dict_id - ((DictInfo *) b)->dict_id;
 }
 
 DictInfo *
-finddict(Oid id) {
+finddict(Oid id)
+{
 	/* last used dict */
-	if ( DList.last_dict && DList.last_dict->dict_id==id )
+	if (DList.last_dict && DList.last_dict->dict_id == id)
 		return DList.last_dict;
 
 
 	/* already used dict */
-	if (  DList.len != 0 ) {
+	if (DList.len != 0)
+	{
 		DictInfo	key;
-		key.dict_id=id;
+
+		key.dict_id = id;
 		DList.last_dict = bsearch(&key, DList.list, DList.len, sizeof(DictInfo), comparedict);
-		if ( DList.last_dict != NULL )
+		if (DList.last_dict != NULL)
 			return DList.last_dict;
 	}
 
 	/* last chance */
-	if ( DList.len==DList.reallen ) {
+	if (DList.len == DList.reallen)
+	{
 		DictInfo   *tmp;
-		int reallen = ( DList.reallen ) ? 2*DList.reallen : 16;
-		tmp=(DictInfo*)realloc(DList.list,sizeof(DictInfo)*reallen);
-		if ( !tmp ) 
-			ts_error(ERROR,"No memory");
-		DList.reallen=reallen;
-		DList.list=tmp;
+		int			reallen = (DList.reallen) ? 2 * DList.reallen : 16;
+
+		tmp = (DictInfo *) realloc(DList.list, sizeof(DictInfo) * reallen);
+		if (!tmp)
+			ts_error(ERROR, "No memory");
+		DList.reallen = reallen;
+		DList.list = tmp;
 	}
-	DList.last_dict=&(DList.list[DList.len]);
+	DList.last_dict = &(DList.list[DList.len]);
 	init_dict(id, DList.last_dict);
 
 	DList.len++;
 	qsort(DList.list, DList.len, sizeof(DictInfo), comparedict);
-	return finddict(id); /* qsort changed order!! */;
+	return finddict(id); /* qsort changed order!! */ ;
 }
 
-static void *plan_name2id=NULL;
+static void *plan_name2id = NULL;
 
 Oid
-name2id_dict(text *name) {
-	Oid arg[1]={ TEXTOID };
+name2id_dict(text *name)
+{
+	Oid			arg[1] = {TEXTOID};
 	bool		isnull;
-	Datum pars[1]={ PointerGetDatum(name) };
+	Datum		pars[1] = {PointerGetDatum(name)};
 	int			stat;
-	Oid id=findSNMap_t( &(DList.name2id_map), name );
+	Oid			id = findSNMap_t(&(DList.name2id_map), name);
 
-	if ( id ) 
+	if (id)
 		return id;
 
 	SPI_connect();
-	if ( !plan_name2id ) {
-		plan_name2id = SPI_saveplan( SPI_prepare( "select oid from pg_ts_dict where dict_name = $1" , 1, arg ) );
-		if ( !plan_name2id ) 
+	if (!plan_name2id)
+	{
+		plan_name2id = SPI_saveplan(SPI_prepare("select oid from pg_ts_dict where dict_name = $1", 1, arg));
+		if (!plan_name2id)
 			ts_error(ERROR, "SPI_prepare() failed");
 	}
 
 	stat = SPI_execp(plan_name2id, pars, " ", 1);
-	if ( stat < 0 )
-		ts_error (ERROR, "SPI_execp return %d", stat);
-	if ( SPI_processed > 0 )
-		id=DatumGetObjectId( SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull) );
+	if (stat < 0)
+		ts_error(ERROR, "SPI_execp return %d", stat);
+	if (SPI_processed > 0)
+		id = DatumGetObjectId(SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull));
 	else
 		ts_error(ERROR, "No dictionary with name '%s'", text2char(name));
 	SPI_finish();
-	addSNMap_t( &(DList.name2id_map), name, id );
+	addSNMap_t(&(DList.name2id_map), name, id);
 	return id;
 }
 
@@ -154,50 +170,56 @@ PG_FUNCTION_INFO_V1(lexize);
 Datum		lexize(PG_FUNCTION_ARGS);
 
 Datum
-lexize(PG_FUNCTION_ARGS) {
-	text *in=PG_GETARG_TEXT_P(1);
-	DictInfo *dict = finddict( PG_GETARG_OID(0) );
-	char	**res, **ptr;
+lexize(PG_FUNCTION_ARGS)
+{
+	text	   *in = PG_GETARG_TEXT_P(1);
+	DictInfo   *dict = finddict(PG_GETARG_OID(0));
+	char	  **res,
+			  **ptr;
 	Datum	   *da;
 	ArrayType  *a;
 
 
-	ptr = res = (char**)DatumGetPointer(
+	ptr = res = (char **) DatumGetPointer(
 									  FunctionCall3(&(dict->lexize_info),
 									   PointerGetDatum(dict->dictionary),
 											PointerGetDatum(VARDATA(in)),
-			Int32GetDatum(VARSIZE(in)-VARHDRSZ)
+									Int32GetDatum(VARSIZE(in) - VARHDRSZ)
 													)
 		);
 	PG_FREE_IF_COPY(in, 1);
-	if ( !res ) {
+	if (!res)
+	{
 		if (PG_NARGS() > 2)
 			PG_RETURN_POINTER(NULL);
 		else
 			PG_RETURN_NULL();
 	}
 
-	while(*ptr) ptr++;
-	da = (Datum*)palloc(sizeof(Datum)*(ptr-res+1));
-	ptr=res;
-	while(*ptr) {
-		da[ ptr-res ] = PointerGetDatum( char2text(*ptr) );
+	while (*ptr)
+		ptr++;
+	da = (Datum *) palloc(sizeof(Datum) * (ptr - res + 1));
+	ptr = res;
+	while (*ptr)
+	{
+		da[ptr - res] = PointerGetDatum(char2text(*ptr));
 		ptr++;
 	}
 
 	a = construct_array(
 						da,
-		ptr-res,
+						ptr - res,
 						TEXTOID,
 						-1,
 						false,
 						'i'
 		);
 
-	ptr=res; 
-	while(*ptr) {
-		pfree( DatumGetPointer(da[ ptr-res ]) );
-		pfree( *ptr );
+	ptr = res;
+	while (*ptr)
+	{
+		pfree(DatumGetPointer(da[ptr - res]));
+		pfree(*ptr);
 		ptr++;
 	}
 	pfree(res);
@@ -209,16 +231,17 @@ lexize(PG_FUNCTION_ARGS) {
 PG_FUNCTION_INFO_V1(lexize_byname);
 Datum		lexize_byname(PG_FUNCTION_ARGS);
 Datum
-lexize_byname(PG_FUNCTION_ARGS) {
-	text *dictname=PG_GETARG_TEXT_P(0);
+lexize_byname(PG_FUNCTION_ARGS)
+{
+	text	   *dictname = PG_GETARG_TEXT_P(0);
 	Datum		res;
 
 	strdup("simple");
-	res=DirectFunctionCall3(
+	res = DirectFunctionCall3(
 							  lexize,
 							  ObjectIdGetDatum(name2id_dict(dictname)),
 							  PG_GETARG_DATUM(1),
-		(Datum)0
+							  (Datum) 0
 		);
 	PG_FREE_IF_COPY(dictname, 0);
 	if (res)
@@ -227,26 +250,28 @@ lexize_byname(PG_FUNCTION_ARGS) {
 		PG_RETURN_NULL();
 }
 
-static Oid currect_dictionary_id=0;
+static Oid	currect_dictionary_id = 0;
 
 PG_FUNCTION_INFO_V1(set_curdict);
 Datum		set_curdict(PG_FUNCTION_ARGS);
 Datum
-set_curdict(PG_FUNCTION_ARGS) {
+set_curdict(PG_FUNCTION_ARGS)
+{
 	finddict(PG_GETARG_OID(0));
-	currect_dictionary_id=PG_GETARG_OID(0);
+	currect_dictionary_id = PG_GETARG_OID(0);
 	PG_RETURN_VOID();
 }
 
 PG_FUNCTION_INFO_V1(set_curdict_byname);
 Datum		set_curdict_byname(PG_FUNCTION_ARGS);
 Datum
-set_curdict_byname(PG_FUNCTION_ARGS) {
-	text *dictname=PG_GETARG_TEXT_P(0);
+set_curdict_byname(PG_FUNCTION_ARGS)
+{
+	text	   *dictname = PG_GETARG_TEXT_P(0);
 
 	DirectFunctionCall1(
 						set_curdict,
-		ObjectIdGetDatum( name2id_dict(dictname) )
+						ObjectIdGetDatum(name2id_dict(dictname))
 		);
 	PG_FREE_IF_COPY(dictname, 0);
 	PG_RETURN_VOID();
@@ -255,9 +280,11 @@ set_curdict_byname(PG_FUNCTION_ARGS) {
 PG_FUNCTION_INFO_V1(lexize_bycurrent);
 Datum		lexize_bycurrent(PG_FUNCTION_ARGS);
 Datum
-lexize_bycurrent(PG_FUNCTION_ARGS) {
+lexize_bycurrent(PG_FUNCTION_ARGS)
+{
 	Datum		res;
-	if ( currect_dictionary_id == 0 )
+
+	if (currect_dictionary_id == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("no currect dictionary"),
@@ -267,12 +294,10 @@ lexize_bycurrent(PG_FUNCTION_ARGS) {
 							  lexize,
 							  ObjectIdGetDatum(currect_dictionary_id),
 							  PG_GETARG_DATUM(0),
-		(Datum)0
+							  (Datum) 0
 		);
 	if (res)
 		PG_RETURN_DATUM(res);
 	else
 		PG_RETURN_NULL();
 }
-
-

contrib/tsearch2/dict.h

@@ -3,36 +3,39 @@
 #include "postgres.h"
 #include "fmgr.h"
 
-typedef struct {
+typedef struct
+{
 	int			len;
 	char	  **stop;
-	char*	(*wordop)(char*);
+	char	   *(*wordop) (char *);
 }	StopList;
 
-void sortstoplist(StopList *s);
-void freestoplist(StopList *s); 
-void readstoplist(text *in, StopList *s);
-bool searchstoplist(StopList *s, char *key);
-char* lowerstr(char *str);
+void		sortstoplist(StopList * s);
+void		freestoplist(StopList * s);
+void		readstoplist(text *in, StopList * s);
+bool		searchstoplist(StopList * s, char *key);
+char	   *lowerstr(char *str);
 
-typedef struct {
+typedef struct
+{
 	Oid			dict_id;
 	FmgrInfo	lexize_info;
 	void	   *dictionary;
 }	DictInfo;
 
-void init_dict(Oid id, DictInfo *dict);
-DictInfo* finddict(Oid id);
+void		init_dict(Oid id, DictInfo * dict);
+DictInfo   *finddict(Oid id);
 Oid			name2id_dict(text *name);
 void		reset_dict(void);
 
 
 /* simple parser of cfg string */
-typedef struct {
+typedef struct
+{
 	char	   *key;
 	char	   *value;
 }	Map;
 
-void parse_cfgdict(text *in, Map **m);
+void		parse_cfgdict(text *in, Map ** m);
 
 #endif

contrib/tsearch2/dict_ex.c

@@ -11,30 +11,35 @@
 #include "dict.h"
 #include "common.h"
 
-typedef struct {
+typedef struct
+{
 	StopList	stoplist;
 }	DictExample;
 
 
 PG_FUNCTION_INFO_V1(dex_init);
 Datum		dex_init(PG_FUNCTION_ARGS);
+
 PG_FUNCTION_INFO_V1(dex_lexize);
 Datum		dex_lexize(PG_FUNCTION_ARGS);
 
 Datum
-dex_init(PG_FUNCTION_ARGS) {
-	DictExample	*d = (DictExample*)malloc( sizeof(DictExample) );
+dex_init(PG_FUNCTION_ARGS)
+{
+	DictExample *d = (DictExample *) malloc(sizeof(DictExample));
 
-	if ( !d )
+	if (!d)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
-	memset(d,0,sizeof(DictExample));
+	memset(d, 0, sizeof(DictExample));
 
-	d->stoplist.wordop=lowerstr;
+	d->stoplist.wordop = lowerstr;
 
-	if ( !PG_ARGISNULL(0) && PG_GETARG_POINTER(0)!=NULL ) {
+	if (!PG_ARGISNULL(0) && PG_GETARG_POINTER(0) != NULL)
+	{
 		text	   *in = PG_GETARG_TEXT_P(0);
+
 		readstoplist(in, &(d->stoplist));
 		sortstoplist(&(d->stoplist));
 		PG_FREE_IF_COPY(in, 0);
@@ -44,18 +49,21 @@ dex_init(PG_FUNCTION_ARGS) {
 }
 
 Datum
-dex_lexize(PG_FUNCTION_ARGS) {
-	DictExample *d = (DictExample*)PG_GETARG_POINTER(0);
-	char       *in = (char*)PG_GETARG_POINTER(1);
+dex_lexize(PG_FUNCTION_ARGS)
+{
+	DictExample *d = (DictExample *) PG_GETARG_POINTER(0);
+	char	   *in = (char *) PG_GETARG_POINTER(1);
 	char	   *txt = pnstrdup(in, PG_GETARG_INT32(2));
-	char	**res=palloc(sizeof(char*)*2);
+	char	  **res = palloc(sizeof(char *) * 2);
 
-	if ( *txt=='\0' || searchstoplist(&(d->stoplist),txt) ) {
+	if (*txt == '\0' || searchstoplist(&(d->stoplist), txt))
+	{
 		pfree(txt);
-		res[0]=NULL;
-	} else 
-		res[0]=txt;
-	res[1]=NULL;
+		res[0] = NULL;
+	}
+	else
+		res[0] = txt;
+	res[1] = NULL;
 
 	PG_RETURN_POINTER(res);
 }

contrib/tsearch2/dict_ispell.c

@@ -12,81 +12,100 @@
 #include "common.h"
 #include "ispell/spell.h"
 
-typedef struct {
+typedef struct
+{
 	StopList	stoplist;
 	IspellDict	obj;
 }	DictISpell;
 
 PG_FUNCTION_INFO_V1(spell_init);
 Datum		spell_init(PG_FUNCTION_ARGS);
+
 PG_FUNCTION_INFO_V1(spell_lexize);
 Datum		spell_lexize(PG_FUNCTION_ARGS);
 
 static void
-freeDictISpell(DictISpell  *d) {
+freeDictISpell(DictISpell * d)
+{
 	FreeIspell(&(d->obj));
 	freestoplist(&(d->stoplist));
 	free(d);
 }
 
 Datum
-spell_init(PG_FUNCTION_ARGS) {
+spell_init(PG_FUNCTION_ARGS)
+{
 	DictISpell *d;
-	Map *cfg, *pcfg;
+	Map		   *cfg,
+			   *pcfg;
 	text	   *in;
-	bool affloaded=false, dictloaded=false, stoploaded=false;
+	bool		affloaded = false,
+				dictloaded = false,
+				stoploaded = false;
 
-	if ( PG_ARGISNULL(0) || PG_GETARG_POINTER(0)==NULL )
+	if (PG_ARGISNULL(0) || PG_GETARG_POINTER(0) == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_CONFIG_FILE_ERROR),
 				 errmsg("ISpell confguration error")));
 
-	d = (DictISpell*)malloc( sizeof(DictISpell) );
-	if ( !d )
+	d = (DictISpell *) malloc(sizeof(DictISpell));
+	if (!d)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
-	memset(d,0,sizeof(DictISpell));
-	d->stoplist.wordop=lowerstr;
+	memset(d, 0, sizeof(DictISpell));
+	d->stoplist.wordop = lowerstr;
 
 	in = PG_GETARG_TEXT_P(0);
-	parse_cfgdict(in,&cfg);
+	parse_cfgdict(in, &cfg);
 	PG_FREE_IF_COPY(in, 0);
-	pcfg=cfg;
-	while(pcfg->key) {
-		if ( strcasecmp("DictFile", pcfg->key) == 0 ) {
-			if ( dictloaded ) {
+	pcfg = cfg;
+	while (pcfg->key)
+	{
+		if (strcasecmp("DictFile", pcfg->key) == 0)
+		{
+			if (dictloaded)
+			{
 				freeDictISpell(d);
 				ereport(ERROR,
 					  (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 					   errmsg("dictionary already loaded")));
 			}
-			if ( ImportDictionary(&(d->obj), pcfg->value) ) {
+			if (ImportDictionary(&(d->obj), pcfg->value))
+			{
 				freeDictISpell(d);
 				ereport(ERROR,
 						(errcode(ERRCODE_CONFIG_FILE_ERROR),
 						 errmsg("could not load dictionary file \"%s\"",
 								pcfg->value)));
 			}
-			dictloaded=true;
-		} else if ( strcasecmp("AffFile", pcfg->key) == 0 ) {
-			if ( affloaded ) {
+			dictloaded = true;
+		}
+		else if (strcasecmp("AffFile", pcfg->key) == 0)
+		{
+			if (affloaded)
+			{
 				freeDictISpell(d);
 				ereport(ERROR,
 					  (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 					   errmsg("affixes already loaded")));
 			}
-			if ( ImportAffixes(&(d->obj), pcfg->value) ) {
+			if (ImportAffixes(&(d->obj), pcfg->value))
+			{
 				freeDictISpell(d);
 				ereport(ERROR,
 						(errcode(ERRCODE_CONFIG_FILE_ERROR),
 						 errmsg("could not load affix file \"%s\"",
 								pcfg->value)));
 			}
-			affloaded=true;
-		} else if ( strcasecmp("StopFile", pcfg->key) == 0 ) {
-			text *tmp=char2text(pcfg->value);
-			if ( stoploaded ) {
+			affloaded = true;
+		}
+		else if (strcasecmp("StopFile", pcfg->key) == 0)
+		{
+			text	   *tmp = char2text(pcfg->value);
+
+			if (stoploaded)
+			{
 				freeDictISpell(d);
 				ereport(ERROR,
 					  (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
@@ -95,8 +114,10 @@ spell_init(PG_FUNCTION_ARGS) {
 			readstoplist(tmp, &(d->stoplist));
 			sortstoplist(&(d->stoplist));
 			pfree(tmp);
-			stoploaded=true;
-		} else {
+			stoploaded = true;
+		}
+		else
+		{
 			freeDictISpell(d);
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
@@ -109,15 +130,20 @@ spell_init(PG_FUNCTION_ARGS) {
 	}
 	pfree(cfg);
 
-	if ( affloaded && dictloaded ) {
+	if (affloaded && dictloaded)
+	{
 		SortDictionary(&(d->obj));
 		SortAffixes(&(d->obj));
-	} else if ( !affloaded ) {
+	}
+	else if (!affloaded)
+	{
 		freeDictISpell(d);
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("no affixes")));
-	} else {
+	}
+	else
+	{
 		freeDictISpell(d);
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
@@ -128,37 +154,43 @@ spell_init(PG_FUNCTION_ARGS) {
 }
 
 Datum
-spell_lexize(PG_FUNCTION_ARGS) {
-	DictISpell *d = (DictISpell*)PG_GETARG_POINTER(0);
-	char       *in = (char*)PG_GETARG_POINTER(1);
+spell_lexize(PG_FUNCTION_ARGS)
+{
+	DictISpell *d = (DictISpell *) PG_GETARG_POINTER(0);
+	char	   *in = (char *) PG_GETARG_POINTER(1);
 	char	   *txt;
 	char	  **res;
-	char 	**ptr, **cptr;
+	char	  **ptr,
+			  **cptr;
 
-	if ( !PG_GETARG_INT32(2) )
+	if (!PG_GETARG_INT32(2))
 		PG_RETURN_POINTER(NULL);
 
-	res=palloc(sizeof(char*)*2);
+	res = palloc(sizeof(char *) * 2);
 	txt = pnstrdup(in, PG_GETARG_INT32(2));
-	res=NormalizeWord(&(d->obj), txt);
+	res = NormalizeWord(&(d->obj), txt);
 	pfree(txt);
 
-	if ( res==NULL ) 
+	if (res == NULL)
 		PG_RETURN_POINTER(NULL);
 
-	ptr=cptr=res;
-	while(*ptr) {
-		if ( searchstoplist(&(d->stoplist),*ptr) ) {
+	ptr = cptr = res;
+	while (*ptr)
+	{
+		if (searchstoplist(&(d->stoplist), *ptr))
+		{
 			pfree(*ptr);
-			*ptr=NULL;
+			*ptr = NULL;
 			ptr++;
-		} else {
-			*cptr=*ptr;
-			cptr++; ptr++;
 		}
+		else
+		{
+			*cptr = *ptr;
+			cptr++;
+			ptr++;
 		}
-	*cptr=NULL;
+	}
+	*cptr = NULL;
 
 	PG_RETURN_POINTER(res);
 }
-

contrib/tsearch2/dict_snowball.c

@@ -14,103 +14,118 @@
 #include "snowball/english_stem.h"
 #include "snowball/russian_stem.h"
 
-typedef struct {
+typedef struct
+{
 	struct SN_env *z;
 	StopList	stoplist;
-	int	(*stem)(struct SN_env * z);
+	int			(*stem) (struct SN_env * z);
 }	DictSnowball;
 
 
 PG_FUNCTION_INFO_V1(snb_en_init);
 Datum		snb_en_init(PG_FUNCTION_ARGS);
+
 PG_FUNCTION_INFO_V1(snb_ru_init);
 Datum		snb_ru_init(PG_FUNCTION_ARGS);
+
 PG_FUNCTION_INFO_V1(snb_lexize);
 Datum		snb_lexize(PG_FUNCTION_ARGS);
 
 Datum
-snb_en_init(PG_FUNCTION_ARGS) {
-	DictSnowball	*d = (DictSnowball*)malloc( sizeof(DictSnowball) );
+snb_en_init(PG_FUNCTION_ARGS)
+{
+	DictSnowball *d = (DictSnowball *) malloc(sizeof(DictSnowball));
 
-	if ( !d )
+	if (!d)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
-	memset(d,0,sizeof(DictSnowball));
-	d->stoplist.wordop=lowerstr;
+	memset(d, 0, sizeof(DictSnowball));
+	d->stoplist.wordop = lowerstr;
 
-	if ( !PG_ARGISNULL(0) && PG_GETARG_POINTER(0)!=NULL ) {
+	if (!PG_ARGISNULL(0) && PG_GETARG_POINTER(0) != NULL)
+	{
 		text	   *in = PG_GETARG_TEXT_P(0);
+
 		readstoplist(in, &(d->stoplist));
 		sortstoplist(&(d->stoplist));
 		PG_FREE_IF_COPY(in, 0);
 	}
 
 	d->z = english_create_env();
-	if (!d->z) {
+	if (!d->z)
+	{
 		freestoplist(&(d->stoplist));
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
 	}
-	d->stem=english_stem;
+	d->stem = english_stem;
 
 	PG_RETURN_POINTER(d);
 }
 
 Datum
-snb_ru_init(PG_FUNCTION_ARGS) {
-	DictSnowball	*d = (DictSnowball*)malloc( sizeof(DictSnowball) );
+snb_ru_init(PG_FUNCTION_ARGS)
+{
+	DictSnowball *d = (DictSnowball *) malloc(sizeof(DictSnowball));
 
-	if ( !d )
+	if (!d)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
-	memset(d,0,sizeof(DictSnowball));
-	d->stoplist.wordop=lowerstr;
+	memset(d, 0, sizeof(DictSnowball));
+	d->stoplist.wordop = lowerstr;
 
-	if ( !PG_ARGISNULL(0) && PG_GETARG_POINTER(0)!=NULL ) {
+	if (!PG_ARGISNULL(0) && PG_GETARG_POINTER(0) != NULL)
+	{
 		text	   *in = PG_GETARG_TEXT_P(0);
+
 		readstoplist(in, &(d->stoplist));
 		sortstoplist(&(d->stoplist));
 		PG_FREE_IF_COPY(in, 0);
 	}
 
 	d->z = russian_create_env();
-	if (!d->z) {
+	if (!d->z)
+	{
 		freestoplist(&(d->stoplist));
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
 	}
-	d->stem=russian_stem;
+	d->stem = russian_stem;
 
 	PG_RETURN_POINTER(d);
 }
 
 Datum
-snb_lexize(PG_FUNCTION_ARGS) {
-	DictSnowball *d = (DictSnowball*)PG_GETARG_POINTER(0);
-	char       *in = (char*)PG_GETARG_POINTER(1);
+snb_lexize(PG_FUNCTION_ARGS)
+{
+	DictSnowball *d = (DictSnowball *) PG_GETARG_POINTER(0);
+	char	   *in = (char *) PG_GETARG_POINTER(1);
 	char	   *txt = pnstrdup(in, PG_GETARG_INT32(2));
-	char	**res=palloc(sizeof(char*)*2);
+	char	  **res = palloc(sizeof(char *) * 2);
 
-	if ( *txt=='\0' || searchstoplist(&(d->stoplist),txt) ) {
+	if (*txt == '\0' || searchstoplist(&(d->stoplist), txt))
+	{
 		pfree(txt);
-		res[0]=NULL;
-	} else {
+		res[0] = NULL;
+	}
+	else
+	{
 		SN_set_current(d->z, strlen(txt), txt);
-		(d->stem)(d->z);
-		if ( d->z->p && d->z->l ) {
-			txt=repalloc(txt, d->z->l+1);
-			memcpy( txt, d->z->p, d->z->l);
-			txt[d->z->l]='\0';
+		(d->stem) (d->z);
+		if (d->z->p && d->z->l)
+		{
+			txt = repalloc(txt, d->z->l + 1);
+			memcpy(txt, d->z->p, d->z->l);
+			txt[d->z->l] = '\0';
 		}
-		res[0]=txt;
+		res[0] = txt;
 	}
-	res[1]=NULL;
+	res[1] = NULL;
 
 
 	PG_RETURN_POINTER(res);
 }
-

contrib/tsearch2/dict_syn.c

@@ -13,93 +13,106 @@
 #include "common.h"
 
 #define SYNBUFLEN	4096
-typedef struct {
+typedef struct
+{
 	char	   *in;
 	char	   *out;
 }	Syn;
 
-typedef struct {
+typedef struct
+{
 	int			len;
 	Syn		   *syn;
 }	DictSyn;
 
 PG_FUNCTION_INFO_V1(syn_init);
 Datum		syn_init(PG_FUNCTION_ARGS);
+
 PG_FUNCTION_INFO_V1(syn_lexize);
 Datum		syn_lexize(PG_FUNCTION_ARGS);
 
 static char *
-findwrd(char *in, char **end) {
+findwrd(char *in, char **end)
+{
 	char	   *start;
 
-	*end=NULL;
-	while(*in && isspace(*in))
+	*end = NULL;
+	while (*in && isspace(*in))
 		in++;
 
-	if ( !in )
+	if (!in)
 		return NULL;
-	start=in;
+	start = in;
 
-	while(*in && !isspace(*in))
+	while (*in && !isspace(*in))
 		in++;
 
-	*end=in;
+	*end = in;
 	return start;
 }
 
 static int
-compareSyn(const void *a, const void *b) {
-	return strcmp( ((Syn*)a)->in, ((Syn*)b)->in );
+compareSyn(const void *a, const void *b)
+{
+	return strcmp(((Syn *) a)->in, ((Syn *) b)->in);
 }
 
 
 Datum
-syn_init(PG_FUNCTION_ARGS) {
+syn_init(PG_FUNCTION_ARGS)
+{
 	text	   *in;
 	DictSyn    *d;
-	int cur=0;
+	int			cur = 0;
 	FILE	   *fin;
 	char	   *filename;
 	char		buf[SYNBUFLEN];
-	char *starti,*starto,*end=NULL;
+	char	   *starti,
+			   *starto,
+			   *end = NULL;
 	int			slen;
 
-	if ( PG_ARGISNULL(0) || PG_GETARG_POINTER(0)==NULL )
+	if (PG_ARGISNULL(0) || PG_GETARG_POINTER(0) == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("NULL config")));
 
 	in = PG_GETARG_TEXT_P(0);
-	if ( VARSIZE(in) - VARHDRSZ == 0 )
+	if (VARSIZE(in) - VARHDRSZ == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("VOID config")));
 
-	filename=text2char(in);
+	filename = text2char(in);
 	PG_FREE_IF_COPY(in, 0);
-	if ( (fin=fopen(filename,"r")) == NULL )
+	if ((fin = fopen(filename, "r")) == NULL)
 		ereport(ERROR,
 				(errcode_for_file_access(),
 				 errmsg("could not open file \"%s\": %m",
 						filename)));
 
-	d = (DictSyn*)malloc( sizeof(DictSyn) );
-	if ( !d ) {
+	d = (DictSyn *) malloc(sizeof(DictSyn));
+	if (!d)
+	{
 		fclose(fin);
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
 	}
-	memset(d,0,sizeof(DictSyn));
+	memset(d, 0, sizeof(DictSyn));
 
-	while( fgets(buf,SYNBUFLEN,fin) ) {
-		slen = strlen(buf)-1;
+	while (fgets(buf, SYNBUFLEN, fin))
+	{
+		slen = strlen(buf) - 1;
 		buf[slen] = '\0';
-		if ( *buf=='\0' ) continue;
-		if (cur==d->len) {
-			d->len = (d->len) ? 2*d->len : 16;
-			d->syn=(Syn*)realloc( d->syn, sizeof(Syn)*d->len );
-			if ( !d->syn ) {
+		if (*buf == '\0')
+			continue;
+		if (cur == d->len)
+		{
+			d->len = (d->len) ? 2 * d->len : 16;
+			d->syn = (Syn *) realloc(d->syn, sizeof(Syn) * d->len);
+			if (!d->syn)
+			{
 				fclose(fin);
 				ereport(ERROR,
 						(errcode(ERRCODE_OUT_OF_MEMORY),
@@ -107,21 +120,22 @@ syn_init(PG_FUNCTION_ARGS) {
 			}
 		}
 
-		starti=findwrd(buf,&end);
-		if ( !starti )
+		starti = findwrd(buf, &end);
+		if (!starti)
 			continue;
-		*end='\0';
-		if ( end >= buf+slen )
+		*end = '\0';
+		if (end >= buf + slen)
 			continue;
 
-		starto= findwrd(end+1, &end);
-		if ( !starto )
+		starto = findwrd(end + 1, &end);
+		if (!starto)
 			continue;
-		*end='\0';
+		*end = '\0';
 
-		d->syn[cur].in=strdup(lowerstr(starti));
-		d->syn[cur].out=strdup(lowerstr(starto));
-		if ( !(d->syn[cur].in && d->syn[cur].out) ) {
+		d->syn[cur].in = strdup(lowerstr(starti));
+		d->syn[cur].out = strdup(lowerstr(starto));
+		if (!(d->syn[cur].in && d->syn[cur].out))
+		{
 			fclose(fin);
 			ereport(ERROR,
 					(errcode(ERRCODE_OUT_OF_MEMORY),
@@ -133,8 +147,8 @@ syn_init(PG_FUNCTION_ARGS) {
 
 	fclose(fin);
 
-	d->len=cur;	
-	if ( cur>1 )
+	d->len = cur;
+	if (cur > 1)
 		qsort(d->syn, d->len, sizeof(Syn), compareSyn);
 
 	pfree(filename);
@@ -142,29 +156,30 @@ syn_init(PG_FUNCTION_ARGS) {
 }
 
 Datum
-syn_lexize(PG_FUNCTION_ARGS) {
-	DictSyn *d = (DictSyn*)PG_GETARG_POINTER(0);
-	char       *in = (char*)PG_GETARG_POINTER(1);
-	Syn	key,*found;
-        char    **res=NULL;
-
-	if ( !PG_GETARG_INT32(2) )
+syn_lexize(PG_FUNCTION_ARGS)
+{
+	DictSyn    *d = (DictSyn *) PG_GETARG_POINTER(0);
+	char	   *in = (char *) PG_GETARG_POINTER(1);
+	Syn			key,
+			   *found;
+	char	  **res = NULL;
+
+	if (!PG_GETARG_INT32(2))
 		PG_RETURN_POINTER(NULL);
 
-	key.out=NULL;
-	key.in=lowerstr(pnstrdup(in, PG_GETARG_INT32(2)));
+	key.out = NULL;
+	key.in = lowerstr(pnstrdup(in, PG_GETARG_INT32(2)));
 
-	found=(Syn*)bsearch(&key, d->syn, d->len, sizeof(Syn), compareSyn);
+	found = (Syn *) bsearch(&key, d->syn, d->len, sizeof(Syn), compareSyn);
 	pfree(key.in);
 
-	if ( !found ) 
+	if (!found)
 		PG_RETURN_POINTER(NULL);
 
-	res=palloc(sizeof(char*)*2);
+	res = palloc(sizeof(char *) * 2);
 
-	res[0]=pstrdup(found->out);
-	res[1]=NULL;
+	res[0] = pstrdup(found->out);
+	res[1] = NULL;
 
 	PG_RETURN_POINTER(res);
 }
-

contrib/tsearch2/ispell/spell.h

@@ -4,12 +4,14 @@
 #include <sys/types.h>
 #include <regex.h>
 
-typedef struct spell_struct {
-        char * word; 
+typedef struct spell_struct
+{
+	char	   *word;
 	char		flag[10];
 }	SPELL;
 
-typedef struct aff_struct {   
+typedef struct aff_struct
+{
 	char		flag;
 	char		type;
 	char		mask[33];
@@ -20,14 +22,17 @@ typedef struct aff_struct {
 	char		compile;
 }	AFFIX;
 
-typedef struct Tree_struct {
-        int Left[256], Right[256];
+typedef struct Tree_struct
+{
+	int			Left[256],
+				Right[256];
 }	Tree_struct;
 
-typedef struct {
+typedef struct
+{
 	int			maffixes;
 	int			naffixes;
-	AFFIX * Affix;
+	AFFIX	   *Affix;
 
 	int			nspell;
 	int			mspell;
@@ -38,14 +43,14 @@ typedef struct {
 
 }	IspellDict;
 
-char ** NormalizeWord(IspellDict * Conf,char *word);
+char	  **NormalizeWord(IspellDict * Conf, char *word);
 int			ImportAffixes(IspellDict * Conf, const char *filename);
-int ImportDictionary(IspellDict * Conf,const char *filename);
+int			ImportDictionary(IspellDict * Conf, const char *filename);
 
-int  AddSpell(IspellDict * Conf,const char * word,const char *flag);
-int  AddAffix(IspellDict * Conf,int flag,const char *mask,const char *find,const char *repl,int type);
+int			AddSpell(IspellDict * Conf, const char *word, const char *flag);
+int			AddAffix(IspellDict * Conf, int flag, const char *mask, const char *find, const char *repl, int type);
 void		SortDictionary(IspellDict * Conf);
 void		SortAffixes(IspellDict * Conf);
-void FreeIspell (IspellDict *Conf);
+void		FreeIspell(IspellDict * Conf);
 
 #endif

contrib/tsearch2/prs_dcfg.c

@@ -22,120 +22,158 @@
 #define CS_IN2ESC	8
 
 static char *
-nstrdup(char *ptr, int len) {
-	char *res=palloc(len+1), *cptr;
-	memcpy(res,ptr,len);
-	res[len]='\0';
+nstrdup(char *ptr, int len)
+{
+	char	   *res = palloc(len + 1),
+			   *cptr;
+
+	memcpy(res, ptr, len);
+	res[len] = '\0';
 	cptr = ptr = res;
-	while(*ptr) {
-		if ( *ptr == '\\' ) 
+	while (*ptr)
+	{
+		if (*ptr == '\\')
+			ptr++;
+		*cptr = *ptr;
 		ptr++;
-		*cptr=*ptr; ptr++; cptr++;
+		cptr++;
 	}
-	*cptr='\0';
+	*cptr = '\0';
 
 	return res;
 }
 
 void
-parse_cfgdict(text *in, Map **m) {
+parse_cfgdict(text *in, Map ** m)
+{
 	Map		   *mptr;
-	char *ptr=VARDATA(in), *begin=NULL;
-	char num=0;
-	int state=CS_WAITKEY;
+	char	   *ptr = VARDATA(in),
+			   *begin = NULL;
+	char		num = 0;
+	int			state = CS_WAITKEY;
 
-	while( ptr-VARDATA(in) < VARSIZE(in) - VARHDRSZ ) {
-		if ( *ptr==',' ) num++;
+	while (ptr - VARDATA(in) < VARSIZE(in) - VARHDRSZ)
+	{
+		if (*ptr == ',')
+			num++;
 		ptr++;
 	}
 
-	*m=mptr=(Map*)palloc( sizeof(Map)*(num+2) );
-	memset(mptr, 0, sizeof(Map)*(num+2) );
-	ptr=VARDATA(in);
-	while( ptr-VARDATA(in) < VARSIZE(in) - VARHDRSZ ) {
-		if (state==CS_WAITKEY) {
-			if (isalpha(*ptr)) {
-				begin=ptr;
-				state=CS_INKEY;
-			} else if ( !isspace(*ptr) )
+	*m = mptr = (Map *) palloc(sizeof(Map) * (num + 2));
+	memset(mptr, 0, sizeof(Map) * (num + 2));
+	ptr = VARDATA(in);
+	while (ptr - VARDATA(in) < VARSIZE(in) - VARHDRSZ)
+	{
+		if (state == CS_WAITKEY)
+		{
+			if (isalpha(*ptr))
+			{
+				begin = ptr;
+				state = CS_INKEY;
+			}
+			else if (!isspace(*ptr))
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("syntax error"),
 					 errdetail("Syntax error in position %d near \"%c\"",
-								   (int) (ptr-VARDATA(in)), *ptr)));
-		} else if (state==CS_INKEY) {
-			if ( isspace(*ptr) ) {
-				mptr->key=nstrdup(begin, ptr-begin);
-				state=CS_WAITEQ;
-			} else if ( *ptr=='=' ) {
-				mptr->key=nstrdup(begin, ptr-begin);
-				state=CS_WAITVALUE;
-			} else if ( !isalpha(*ptr) ) 
+							   (int) (ptr - VARDATA(in)), *ptr)));
+		}
+		else if (state == CS_INKEY)
+		{
+			if (isspace(*ptr))
+			{
+				mptr->key = nstrdup(begin, ptr - begin);
+				state = CS_WAITEQ;
+			}
+			else if (*ptr == '=')
+			{
+				mptr->key = nstrdup(begin, ptr - begin);
+				state = CS_WAITVALUE;
+			}
+			else if (!isalpha(*ptr))
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("syntax error"),
 					 errdetail("Syntax error in position %d near \"%c\"",
-								   (int) (ptr-VARDATA(in)), *ptr)));
-		} else if ( state==CS_WAITEQ ) {
-			if ( *ptr=='=' )
-				state=CS_WAITVALUE;
-			else if ( !isspace(*ptr) )
+							   (int) (ptr - VARDATA(in)), *ptr)));
+		}
+		else if (state == CS_WAITEQ)
+		{
+			if (*ptr == '=')
+				state = CS_WAITVALUE;
+			else if (!isspace(*ptr))
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("syntax error"),
 					 errdetail("Syntax error in position %d near \"%c\"",
-								   (int) (ptr-VARDATA(in)), *ptr)));
-		} else if ( state==CS_WAITVALUE ) {
-			if ( *ptr=='"' ) {
-				begin=ptr+1;
-				state=CS_INVALUE;
-			} else if ( !isspace(*ptr) ) {
-				begin=ptr;
-				state=CS_IN2VALUE;
-			}
-		} else if ( state==CS_INVALUE ) {
-			if ( *ptr=='"' ) {
-				mptr->value = nstrdup(begin, ptr-begin);
+							   (int) (ptr - VARDATA(in)), *ptr)));
+		}
+		else if (state == CS_WAITVALUE)
+		{
+			if (*ptr == '"')
+			{
+				begin = ptr + 1;
+				state = CS_INVALUE;
+			}
+			else if (!isspace(*ptr))
+			{
+				begin = ptr;
+				state = CS_IN2VALUE;
+			}
+		}
+		else if (state == CS_INVALUE)
+		{
+			if (*ptr == '"')
+			{
+				mptr->value = nstrdup(begin, ptr - begin);
 				mptr++;
-				state=CS_WAITDELIM;
-			} else if ( *ptr=='\\' )
-				state=CS_INESC;
-		} else if ( state==CS_IN2VALUE ) {
-			if ( isspace(*ptr) || *ptr==',' ) {
-				mptr->value = nstrdup(begin, ptr-begin);
+				state = CS_WAITDELIM;
+			}
+			else if (*ptr == '\\')
+				state = CS_INESC;
+		}
+		else if (state == CS_IN2VALUE)
+		{
+			if (isspace(*ptr) || *ptr == ',')
+			{
+				mptr->value = nstrdup(begin, ptr - begin);
 				mptr++;
-				state=( *ptr==',' ) ? CS_WAITKEY : CS_WAITDELIM;
-			} else if ( *ptr=='\\' )
-				state=CS_INESC;
-		} else if ( state==CS_WAITDELIM ) {
-			if ( *ptr==',' ) 
-				state=CS_WAITKEY; 
-			else if ( !isspace(*ptr) )
+				state = (*ptr == ',') ? CS_WAITKEY : CS_WAITDELIM;
+			}
+			else if (*ptr == '\\')
+				state = CS_INESC;
+		}
+		else if (state == CS_WAITDELIM)
+		{
+			if (*ptr == ',')
+				state = CS_WAITKEY;
+			else if (!isspace(*ptr))
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("syntax error"),
 					 errdetail("Syntax error in position %d near \"%c\"",
-								   (int) (ptr-VARDATA(in)), *ptr)));
-		} else if ( state == CS_INESC ) {
-			state=CS_INVALUE;
-		} else if ( state == CS_IN2ESC ) {
-			state=CS_IN2VALUE;
-		} else 
+							   (int) (ptr - VARDATA(in)), *ptr)));
+		}
+		else if (state == CS_INESC)
+			state = CS_INVALUE;
+		else if (state == CS_IN2ESC)
+			state = CS_IN2VALUE;
+		else
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
 					 errmsg("bad parser state"),
 					 errdetail("%d at position %d near \"%c\"",
-								state, (int) (ptr-VARDATA(in)), *ptr)));
+							   state, (int) (ptr - VARDATA(in)), *ptr)));
 		ptr++;
 	}
 
-	if (state==CS_IN2VALUE) {
-		mptr->value = nstrdup(begin, ptr-begin);
+	if (state == CS_IN2VALUE)
+	{
+		mptr->value = nstrdup(begin, ptr - begin);
 		mptr++;
-	} else if ( !(state==CS_WAITDELIM || state==CS_WAITKEY) ) 
+	}
+	else if (!(state == CS_WAITDELIM || state == CS_WAITKEY))
 		ereport(ERROR,
 				(errcode(ERRCODE_SYNTAX_ERROR),
 				 errmsg("unexpected end of line")));
 }
-
-

contrib/tsearch2/query.c

@@ -102,21 +102,33 @@ typedef struct
 	int			cfg_id;
 }	QPRS_STATE;
 
-static char*
-get_weight(char *buf, int2 *weight) {
+static char *
+get_weight(char *buf, int2 *weight)
+{
 	*weight = 0;
 
-	if ( *buf != ':' )
+	if (*buf != ':')
 		return buf;
 
 	buf++;
-	while( *buf ) {
-		switch(tolower(*buf)) {
-			case 'a': *weight |= 1<<3; break; 
-			case 'b': *weight |= 1<<2; break; 
-			case 'c': *weight |= 1<<1; break; 
-			case 'd': *weight |= 1;    break;
-			default: return buf; 
+	while (*buf)
+	{
+		switch (tolower(*buf))
+		{
+			case 'a':
+				*weight |= 1 << 3;
+				break;
+			case 'b':
+				*weight |= 1 << 2;
+				break;
+			case 'c':
+				*weight |= 1 << 1;
+				break;
+			case 'd':
+				*weight |= 1;
+				break;
+			default:
+				return buf;
 		}
 		buf++;
 	}
@@ -146,11 +158,15 @@ gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval, int2
 					state->count++;
 					(state->buf)++;
 					return OPEN;
-				} else if ( *(state->buf) == ':' ) {
+				}
+				else if (*(state->buf) == ':')
+				{
 					ereport(ERROR,
 							(errcode(ERRCODE_SYNTAX_ERROR),
 							 errmsg("error at start of operand")));
-				} else if (*(state->buf) != ' ') {
+				}
+				else if (*(state->buf) != ' ')
+				{
 					state->valstate.prsbuf = state->buf;
 					state->state = WAITOPERATOR;
 					if (gettoken_tsvector(&(state->valstate)))
@@ -266,16 +282,17 @@ pushval_morph(QPRS_STATE * state, int typeval, char *strval, int lenval, int2 we
 
 	parsetext_v2(findcfg(state->cfg_id), &prs, strval, lenval);
 
-	for(count=0;count<prs.curwords;count++) {
+	for (count = 0; count < prs.curwords; count++)
+	{
 		pushval_asis(state, VAL, prs.words[count].word, prs.words[count].len, weight);
-		pfree( prs.words[count].word );
+		pfree(prs.words[count].word);
 		if (count)
-			pushquery(state, OPR, (int4) '&', 0, 0, 0 );
+			pushquery(state, OPR, (int4) '&', 0, 0, 0);
 	}
 	pfree(prs.words);
 
 	/* XXX */
-	if ( prs.curwords==0 ) 
+	if (prs.curwords == 0)
 		pushval_asis(state, VALTRUE, 0, 0, 0);
 }
 
@@ -381,11 +398,14 @@ ValCompare(CHKVAL * chkval, WordEntry * ptr, ITEM * item)
  * check weight info
  */
 static bool
-checkclass_str(CHKVAL * chkval, WordEntry * val, ITEM * item) {
-	WordEntryPos *ptr = (WordEntryPos*) (chkval->values+val->pos+SHORTALIGN(val->len)+sizeof(uint16));
-	uint16	len = *( (uint16*) (chkval->values+val->pos+SHORTALIGN(val->len)) );
-	while (len--) {
-		if ( item->weight & ( 1<<ptr->weight ) )
+checkclass_str(CHKVAL * chkval, WordEntry * val, ITEM * item)
+{
+	WordEntryPos *ptr = (WordEntryPos *) (chkval->values + val->pos + SHORTALIGN(val->len) + sizeof(uint16));
+	uint16		len = *((uint16 *) (chkval->values + val->pos + SHORTALIGN(val->len)));
+
+	while (len--)
+	{
+		if (item->weight & (1 << ptr->weight))
 			return true;
 		ptr++;
 	}
@@ -410,8 +430,8 @@ checkcondition_str(void *checkval, ITEM * val)
 		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
 		difference = ValCompare((CHKVAL *) checkval, StopMiddle, val);
 		if (difference == 0)
-			return ( val->weight && StopMiddle->haspos ) ? 
-				checkclass_str((CHKVAL *) checkval,StopMiddle, val) : true;
+			return (val->weight && StopMiddle->haspos) ?
+				checkclass_str((CHKVAL *) checkval, StopMiddle, val) : true;
 		else if (difference < 0)
 			StopLow = StopMiddle + 1;
 		else
@@ -534,7 +554,7 @@ findoprnd(ITEM * ptr, int4 *pos)
  * input
  */
 static QUERYTYPE *
-queryin(char *buf, void (*pushval) (QPRS_STATE *, int, char *, int, int2), int cfg_id)
+			queryin(char *buf, void (*pushval) (QPRS_STATE *, int, char *, int, int2), int cfg_id)
 {
 	QPRS_STATE	state;
 	int4		i;
@@ -555,7 +575,7 @@ queryin(char *buf, void (*pushval) (QPRS_STATE *, int, char *, int, int2), int c
 	state.count = 0;
 	state.num = 0;
 	state.str = NULL;
-	state.cfg_id=cfg_id;
+	state.cfg_id = cfg_id;
 
 	/* init value parser's state */
 	state.valstate.oprisdelim = true;
@@ -678,12 +698,30 @@ infix(INFIX * in, bool first)
 		}
 		*(in->cur) = '\'';
 		in->cur++;
-		if ( in->curpol->weight ) {
-			*(in->cur) = ':'; in->cur++;
-			if ( in->curpol->weight & (1<<3) ) { *(in->cur) = 'A'; in->cur++; }
-			if ( in->curpol->weight & (1<<2) ) { *(in->cur) = 'B'; in->cur++; }
-			if ( in->curpol->weight & (1<<1) ) { *(in->cur) = 'C'; in->cur++; }
-			if ( in->curpol->weight & 1 )      { *(in->cur) = 'D'; in->cur++; }
+		if (in->curpol->weight)
+		{
+			*(in->cur) = ':';
+			in->cur++;
+			if (in->curpol->weight & (1 << 3))
+			{
+				*(in->cur) = 'A';
+				in->cur++;
+			}
+			if (in->curpol->weight & (1 << 2))
+			{
+				*(in->cur) = 'B';
+				in->cur++;
+			}
+			if (in->curpol->weight & (1 << 1))
+			{
+				*(in->cur) = 'C';
+				in->cur++;
+			}
+			if (in->curpol->weight & 1)
+			{
+				*(in->cur) = 'D';
+				in->cur++;
+			}
 		}
 		*(in->cur) = '\0';
 		in->curpol++;
@@ -827,15 +865,16 @@ tsquerytree(PG_FUNCTION_ARGS)
 }
 
 Datum
-to_tsquery(PG_FUNCTION_ARGS) {
+to_tsquery(PG_FUNCTION_ARGS)
+{
 	text	   *in = PG_GETARG_TEXT_P(1);
 	char	   *str;
 	QUERYTYPE  *query;
 	ITEM	   *res;
 	int4		len;
 
-	str=text2char(in);
-	PG_FREE_IF_COPY(in,1);
+	str = text2char(in);
+	PG_FREE_IF_COPY(in, 1);
 
 	query = queryin(str, pushval_morph, PG_GETARG_INT32(0));
 	res = clean_fakeval_v2(GETQUERY(query), &len);
@@ -851,25 +890,25 @@ to_tsquery(PG_FUNCTION_ARGS) {
 }
 
 Datum
-to_tsquery_name(PG_FUNCTION_ARGS) {
-	text *name=PG_GETARG_TEXT_P(0);
-	Datum res= DirectFunctionCall2(
+to_tsquery_name(PG_FUNCTION_ARGS)
+{
+	text	   *name = PG_GETARG_TEXT_P(0);
+	Datum		res = DirectFunctionCall2(
 										  to_tsquery,
-		Int32GetDatum( name2id_cfg(name) ),
+										Int32GetDatum(name2id_cfg(name)),
 										  PG_GETARG_DATUM(1)
 	);
 
-	PG_FREE_IF_COPY(name,1);
+	PG_FREE_IF_COPY(name, 1);
 	PG_RETURN_DATUM(res);
 }
 
 Datum
-to_tsquery_current(PG_FUNCTION_ARGS) {
-	PG_RETURN_DATUM( DirectFunctionCall2(
+to_tsquery_current(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_DATUM(DirectFunctionCall2(
 										to_tsquery,
-		Int32GetDatum( get_currcfg() ),
+										Int32GetDatum(get_currcfg()),
 										PG_GETARG_DATUM(0)
 										));
 }
-
-

contrib/tsearch2/snmap.c

@@ -11,69 +11,85 @@
 #include "common.h"
 
 static int
-compareSNMapEntry(const void *a, const void *b) {
-	return strcmp( ((SNMapEntry*)a)->key, ((SNMapEntry*)b)->key );
+compareSNMapEntry(const void *a, const void *b)
+{
+	return strcmp(((SNMapEntry *) a)->key, ((SNMapEntry *) b)->key);
 }
 
 void
-addSNMap( SNMap *map, char *key, Oid value ) {
-	if (map->len>=map->reallen) {
+addSNMap(SNMap * map, char *key, Oid value)
+{
+	if (map->len >= map->reallen)
+	{
 		SNMapEntry *tmp;
-		int len = (map->reallen) ? 2*map->reallen : 16;
-		tmp=(SNMapEntry*)realloc(map->list, sizeof(SNMapEntry) * len);
-		if ( !tmp )
+		int			len = (map->reallen) ? 2 * map->reallen : 16;
+
+		tmp = (SNMapEntry *) realloc(map->list, sizeof(SNMapEntry) * len);
+		if (!tmp)
 			ereport(ERROR,
 					(errcode(ERRCODE_OUT_OF_MEMORY),
 					 errmsg("out of memory")));
-		map->reallen=len;
-		map->list=tmp;
+		map->reallen = len;
+		map->list = tmp;
 	}
-	map->list[ map->len ].key = strdup(key);
-	if ( ! map->list[ map->len ].key )
+	map->list[map->len].key = strdup(key);
+	if (!map->list[map->len].key)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
 				 errmsg("out of memory")));
-	map->list[ map->len ].value=value;
+	map->list[map->len].value = value;
 	map->len++;
-	if ( map->len>1 ) qsort(map->list, map->len, sizeof(SNMapEntry), compareSNMapEntry);
+	if (map->len > 1)
+		qsort(map->list, map->len, sizeof(SNMapEntry), compareSNMapEntry);
 }
 
 void
-addSNMap_t( SNMap *map, text *key, Oid value ) {
-	char *k=text2char( key );
+addSNMap_t(SNMap * map, text *key, Oid value)
+{
+	char	   *k = text2char(key);
+
 	addSNMap(map, k, value);
 	pfree(k);
 }
 
 Oid
-findSNMap( SNMap *map, char *key ) {
+findSNMap(SNMap * map, char *key)
+{
 	SNMapEntry *ptr;
 	SNMapEntry	ks = {key, 0};
-	if ( map->len==0 || !map->list )
+
+	if (map->len == 0 || !map->list)
 		return 0;
-	ptr = (SNMapEntry*) bsearch(&ks, map->list, map->len, sizeof(SNMapEntry), compareSNMapEntry);
+	ptr = (SNMapEntry *) bsearch(&ks, map->list, map->len, sizeof(SNMapEntry), compareSNMapEntry);
 	return (ptr) ? ptr->value : 0;
 }
 
 Oid
-findSNMap_t( SNMap *map, text *key ) {
-	char *k=text2char(key);
+findSNMap_t(SNMap * map, text *key)
+{
+	char	   *k = text2char(key);
 	int			res;
-	res= findSNMap(map, k);
+
+	res = findSNMap(map, k);
 	pfree(k);
 	return res;
 }
 
-void freeSNMap( SNMap *map ) {
-	SNMapEntry *entry=map->list;
-	if ( map->list ) {
-		while( map->len ) {
-			if ( entry->key ) free(entry->key);
-			entry++; map->len--;
+void
+freeSNMap(SNMap * map)
+{
+	SNMapEntry *entry = map->list;
+
+	if (map->list)
+	{
+		while (map->len)
+		{
+			if (entry->key)
+				free(entry->key);
+			entry++;
+			map->len--;
 		}
-		free( map->list );
+		free(map->list);
 	}
-	memset(map,0,sizeof(SNMap));
+	memset(map, 0, sizeof(SNMap));
 }
-
-

contrib/tsearch2/snmap.h

@@ -3,21 +3,23 @@
 
 #include "postgres.h"
 
-typedef struct {
+typedef struct
+{
 	char	   *key;
 	Oid			value;
 }	SNMapEntry;
 
-typedef struct {
+typedef struct
+{
 	int			len;
 	int			reallen;
 	SNMapEntry *list;
 }	SNMap;
 
-void addSNMap( SNMap *map, char *key, Oid value );
-void addSNMap_t( SNMap *map, text *key, Oid value );
-Oid findSNMap( SNMap *map, char *key );
-Oid findSNMap_t( SNMap *map, text *key );
-void freeSNMap( SNMap *map );
+void		addSNMap(SNMap * map, char *key, Oid value);
+void		addSNMap_t(SNMap * map, text *key, Oid value);
+Oid			findSNMap(SNMap * map, char *key);
+Oid			findSNMap_t(SNMap * map, text *key);
+void		freeSNMap(SNMap * map);
 
 #endif

contrib/tsearch2/snowball/api.h

@@ -11,17 +11,24 @@ typedef unsigned char symbol;
 
 */
 
-struct SN_env {
-    symbol * p;
-    int c; int a; int l; int lb; int bra; int ket;
-    int S_size; int I_size; int B_size;
-    symbol * * S;
-    int * I;
-    symbol * B;
+struct SN_env
+{
+	symbol	   *p;
+	int			c;
+	int			a;
+	int			l;
+	int			lb;
+	int			bra;
+	int			ket;
+	int			S_size;
+	int			I_size;
+	int			B_size;
+	symbol	   **S;
+	int		   *I;
+	symbol	   *B;
 };
 
-extern struct SN_env * SN_create_env(int S_size, int I_size, int B_size);
+extern struct SN_env *SN_create_env(int S_size, int I_size, int B_size);
 extern void SN_close_env(struct SN_env * z);
 
 extern void SN_set_current(struct SN_env * z, int size, const symbol * s);
-

contrib/tsearch2/snowball/english_stem.h

 
 /* This file was generated automatically by the Snowball to ANSI C compiler */
 
-extern struct SN_env * english_create_env(void);
+extern struct SN_env *english_create_env(void);
 extern void english_close_env(struct SN_env * z);
 
 extern int	english_stem(struct SN_env * z);
-