pgindent run on all C files. Java run to follow. initdb/regression

tests pass.

3 files changed, 20 insertions, 26 deletions

diff --git a/src/backend/regex/engine.c b/src/backend/regex/engine.c
index 2d7f4ee92d0..79b71415ed3 100644
--- a/src/backend/regex/engine.c
+++ b/src/backend/regex/engine.c
@@ -87,15 +87,15 @@ struct match
 	states		empty;			/* empty set of states */
 };
 
-static int matcher(struct re_guts * g, pg_wchar * string, size_t nmatch,
+static int matcher(struct re_guts * g, pg_wchar *string, size_t nmatch,
 		regmatch_t *pmatch, int eflags);
-static pg_wchar *dissect(struct match * m, pg_wchar * start, pg_wchar * stop,
+static pg_wchar *dissect(struct match * m, pg_wchar *start, pg_wchar *stop,
 		sopno startst, sopno stopst);
-static pg_wchar *backref(struct match * m, pg_wchar * start, pg_wchar * stop,
+static pg_wchar *backref(struct match * m, pg_wchar *start, pg_wchar *stop,
 		sopno startst, sopno stopst, sopno lev);
-static pg_wchar *fast(struct match * m, pg_wchar * start, pg_wchar * stop,
+static pg_wchar *fast(struct match * m, pg_wchar *start, pg_wchar *stop,
 	 sopno startst, sopno stopst);
-static pg_wchar *slow(struct match * m, pg_wchar * start, pg_wchar * stop,
+static pg_wchar *slow(struct match * m, pg_wchar *start, pg_wchar *stop,
 	 sopno startst, sopno stopst);
 static states step(struct re_guts * g, sopno start,
 	 sopno stop, states bef, int ch, states aft);
@@ -117,13 +117,12 @@ static states step(struct re_guts * g, sopno start,
 #endif
 
 #ifdef REDEBUG
-static void print(struct match * m, pg_wchar * caption, states st, int ch,
+static void print(struct match * m, pg_wchar *caption, states st, int ch,
 	  FILE *d);
-static void at(struct match * m, pg_wchar * title, pg_wchar * start,
-   pg_wchar * stop, sopno startst, sopno stopst);
+static void at(struct match * m, pg_wchar *title, pg_wchar *start,
+   pg_wchar *stop, sopno startst, sopno stopst);
 static pg_wchar *pchar(int ch);
 static int	pg_isprint(int c);
-
 #endif
 
 #ifdef REDEBUG
@@ -145,7 +144,7 @@ do { \
  * matcher - the actual matching engine
  */
 static int						/* 0 success, REG_NOMATCH failure */
-matcher(struct re_guts * g, pg_wchar * string, size_t nmatch,
+matcher(struct re_guts * g, pg_wchar *string, size_t nmatch,
 		regmatch_t *pmatch, int eflags)
 {
 	pg_wchar   *endp;
@@ -331,7 +330,7 @@ matcher(struct re_guts * g, pg_wchar * string, size_t nmatch,
  * dissect - figure out what matched what, no back references
  */
 static pg_wchar *				/* == stop (success) always */
-dissect(struct match * m, pg_wchar * start, pg_wchar * stop,
+dissect(struct match * m, pg_wchar *start, pg_wchar *stop,
 		sopno startst, sopno stopst)
 {
 	int			i;
@@ -527,7 +526,7 @@ dissect(struct match * m, pg_wchar * start, pg_wchar * stop,
  * lev is PLUS nesting level
  */
 static pg_wchar *				/* == stop (success) or NULL (failure) */
-backref(struct match * m, pg_wchar * start, pg_wchar * stop,
+backref(struct match * m, pg_wchar *start, pg_wchar *stop,
 		sopno startst, sopno stopst, sopno lev)
 {
 	int			i;
@@ -686,7 +685,7 @@ backref(struct match * m, pg_wchar * start, pg_wchar * stop,
 					return dp;
 				/* that one missed, try next one */
 				if (OP(m->g->strip[esub]) == O_CH)
-					return NULL;/* there is none */
+					return NULL;		/* there is none */
 				esub++;
 				assert(OP(m->g->strip[esub]) == OOR2);
 				ssub = esub + 1;
@@ -734,7 +733,7 @@ backref(struct match * m, pg_wchar * start, pg_wchar * stop,
  * fast - step through the string at top speed
  */
 static pg_wchar *				/* where tentative match ended, or NULL */
-fast(struct match * m, pg_wchar * start, pg_wchar * stop,
+fast(struct match * m, pg_wchar *start, pg_wchar *stop,
 	 sopno startst, sopno stopst)
 {
 	states		st = m->st;
@@ -823,7 +822,7 @@ fast(struct match * m, pg_wchar * start, pg_wchar * stop,
  * slow - step through the string more deliberately
  */
 static pg_wchar *				/* where it ended */
-slow(struct match * m, pg_wchar * start, pg_wchar * stop,
+slow(struct match * m, pg_wchar *start, pg_wchar *stop,
 	 sopno startst, sopno stopst)
 {
 	states		st = m->st;
@@ -1029,7 +1028,7 @@ step(struct re_guts * g,
  * print - print a set of states
  */
 static void
-print(struct match * m, pg_wchar * caption, states st,
+print(struct match * m, pg_wchar *caption, states st,
 	  int ch, FILE *d)
 {
 	struct re_guts *g = m->g;
@@ -1055,7 +1054,7 @@ print(struct match * m, pg_wchar * caption, states st,
  * at - print current situation
  */
 static void
-at(struct match * m, pg_wchar * title, pg_wchar * start, pg_wchar * stop,
+at(struct match * m, pg_wchar *title, pg_wchar *start, pg_wchar *stop,
    sopno startst, sopno stopst)
 {
 	if (!(m->eflags & REG_TRACE))
@@ -1097,7 +1096,6 @@ pg_isprint(int c)
 	return (isprint((unsigned char) c));
 #endif
 }
-
 #endif
 #endif
 
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 837a12c27ce..3b433b20f45 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -88,7 +88,6 @@ static unsigned char othercase(int ch);
 
 #else
 static char othercase(int ch);
-
 #endif
 static void bothcases(struct parse * p, int ch);
 static void ordinary(struct parse * p, int ch);
@@ -173,7 +172,6 @@ pg95_regcomp(regex_t *preg, const char *pattern, int cflags)
 
 #ifdef MULTIBYTE
 	pg_wchar   *wcp;
-
 #endif
 
 #ifdef REDEBUG
@@ -724,7 +722,6 @@ p_bracket(struct parse * p)
 #ifdef MULTIBYTE
 	pg_wchar	sp1[] = {'[', ':', '<', ':', ']', ']'};
 	pg_wchar	sp2[] = {'[', ':', '>', ':', ']', ']'};
-
 #endif
 
 	/* Dept of Truly Sickening Special-Case Kludges */
@@ -930,7 +927,7 @@ p_b_eclass(struct parse * p, cset *cs)
 /*
  * p_b_symbol - parse a character or [..]ed multicharacter collating symbol
  */
-static pg_wchar			/* value of symbol */
+static pg_wchar					/* value of symbol */
 p_b_symbol(struct parse * p)
 {
 	pg_wchar	value;
@@ -1020,7 +1017,7 @@ bothcases(struct parse * p, int ch)
 	pg_wchar   *oldend = p->end;
 	pg_wchar	bracket[3];
 
-	assert(othercase(ch) != ch);/* p_bracket() would recurse */
+	assert(othercase(ch) != ch);		/* p_bracket() would recurse */
 	p->next = bracket;
 	p->end = bracket + 2;
 	bracket[0] = ch;
@@ -1110,7 +1107,7 @@ repeat(struct parse * p,
 		case REP(0, N): /* as x{1,n}? */
 		case REP(0, INF):		/* as x{1,}? */
 			/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-			INSERT(OCH_, start);/* offset is wrong... */
+			INSERT(OCH_, start);		/* offset is wrong... */
 			repeat(p, start + 1, 1, to);
 			ASTERN(OOR1, start);
 			AHEAD(start);		/* ... fix it */
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index b1733a9d40d..47677304413 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -126,7 +126,7 @@ do { \
 do { \
 	free((m)->space); \
 } while (0)
-	
+
 #define SETUP(v)		((v) = &m->space[m->vn++ * m->g->nstates])
 #define onestate		int
 #define INIT(o, n)		((o) = (n))
@@ -157,7 +157,6 @@ pg95_regexec(const regex_t *preg, const char *string, size_t nmatch,
 #ifdef MULTIBYTE
 	pg_wchar   *str;
 	int			sts;
-
 #endif
 
 #ifdef REDEBUG