Another PGINDENT run that changes variable indenting and case label indenting. Also static variable indenting.

5 files changed, 54 insertions, 54 deletions

diff --git a/src/include/regex/cclass.h b/src/include/regex/cclass.h
index 271d1e418e6..2ab5eca33f5 100644
--- a/src/include/regex/cclass.h
+++ b/src/include/regex/cclass.h
@@ -40,10 +40,10 @@
 /* character-class table */
 static struct cclass
 {
-	char		   *name;
-	char		   *chars;
-	char		   *multis;
-}				cclasses[] =
+	char	   *name;
+	char	   *chars;
+	char	   *multis;
+}			cclasses[] =
 
 {
 	{
diff --git a/src/include/regex/cname.h b/src/include/regex/cname.h
index 8cf78f7cbe5..a333e9c4e5e 100644
--- a/src/include/regex/cname.h
+++ b/src/include/regex/cname.h
@@ -40,9 +40,9 @@
 /* character-name table */
 static struct cname
 {
-	char		   *name;
-	char			code;
-}				cnames[] =
+	char	   *name;
+	char		code;
+}			cnames[] =
 
 {
 	{
diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h
index 18b39768849..94b3ea4a2d8 100644
--- a/src/include/regex/regex.h
+++ b/src/include/regex/regex.h
@@ -43,21 +43,21 @@
 #include <sys/types.h>
 
 /* types */
-typedef off_t	regoff_t;
+typedef off_t regoff_t;
 
 typedef struct
 {
-	int				re_magic;
-	size_t			re_nsub;	/* number of parenthesized subexpressions */
-	const char	   *re_endp;	/* end pointer for REG_PEND */
+	int			re_magic;
+	size_t		re_nsub;		/* number of parenthesized subexpressions */
+	const char *re_endp;		/* end pointer for REG_PEND */
 	struct re_guts *re_g;		/* none of your business :-) */
-}				regex_t;
+}			regex_t;
 
 typedef struct
 {
-	regoff_t		rm_so;		/* start of match */
-	regoff_t		rm_eo;		/* end of match */
-}				regmatch_t;
+	regoff_t	rm_so;			/* start of match */
+	regoff_t	rm_eo;			/* end of match */
+}			regmatch_t;
 
 /* regcomp() flags */
 #define REG_BASIC		0000
@@ -97,11 +97,11 @@ typedef struct
 #define REG_LARGE		01000	/* force large representation */
 #define REG_BACKR		02000	/* force use of backref code */
 
-int				pg95_regcomp(regex_t *, const char *, int);
-size_t			pg95_regerror(int, const regex_t *, char *, size_t);
+int			pg95_regcomp(regex_t *, const char *, int);
+size_t		pg95_regerror(int, const regex_t *, char *, size_t);
 int
 pg95_regexec(const regex_t *,
 			 const char *, size_t, regmatch_t[], int);
-void			pg95_regfree(regex_t *);
+void		pg95_regfree(regex_t *);
 
 #endif							/* !_REGEX_H_ */
diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h
index 960a6d1dfce..70b03b0250a 100644
--- a/src/include/regex/regex2.h
+++ b/src/include/regex/regex2.h
@@ -78,7 +78,7 @@
  * immediately *preceding* "execution" of that operator.
  */
 typedef unsigned long sop;		/* strip operator */
-typedef long	sopno;
+typedef long sopno;
 
 #define OPRMASK 0xf8000000
 #define OPDMASK 0x07ffffff
@@ -125,12 +125,12 @@ typedef long	sopno;
  */
 typedef struct
 {
-	uch			   *ptr;		/* -> uch [csetsize] */
-	uch				mask;		/* bit within array */
-	uch				hash;		/* hash code */
-	size_t			smultis;
-	char		   *multis;		/* -> char[smulti]	ab\0cd\0ef\0\0 */
-}				cset;
+	uch		   *ptr;			/* -> uch [csetsize] */
+	uch			mask;			/* bit within array */
+	uch			hash;			/* hash code */
+	size_t		smultis;
+	char	   *multis;			/* -> char[smulti]	ab\0cd\0ef\0\0 */
+}			cset;
 
 /* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */
 #define CHadd(cs, c)	((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (c))
@@ -149,32 +149,32 @@ typedef unsigned char cat_t;
  */
 struct re_guts
 {
-	int				magic;
+	int			magic;
 #define  MAGIC2  ((('R'^0200)<<8)|'E')
-	sop			   *strip;		/* malloced area for strip */
-	int				csetsize;	/* number of bits in a cset vector */
-	int				ncsets;		/* number of csets in use */
-	cset		   *sets;		/* -> cset [ncsets] */
-	uch			   *setbits;	/* -> uch[csetsize][ncsets/CHAR_BIT] */
-	int				cflags;		/* copy of regcomp() cflags argument */
-	sopno			nstates;	/* = number of sops */
-	sopno			firststate; /* the initial OEND (normally 0) */
-	sopno			laststate;	/* the final OEND */
-	int				iflags;		/* internal flags */
+	sop		   *strip;			/* malloced area for strip */
+	int			csetsize;		/* number of bits in a cset vector */
+	int			ncsets;			/* number of csets in use */
+	cset	   *sets;			/* -> cset [ncsets] */
+	uch		   *setbits;		/* -> uch[csetsize][ncsets/CHAR_BIT] */
+	int			cflags;			/* copy of regcomp() cflags argument */
+	sopno		nstates;		/* = number of sops */
+	sopno		firststate;		/* the initial OEND (normally 0) */
+	sopno		laststate;		/* the final OEND */
+	int			iflags;			/* internal flags */
 #define  USEBOL  01				/* used ^ */
 #define  USEEOL  02				/* used $ */
 #define  BAD	 04				/* something wrong */
-	int				nbol;		/* number of ^ used */
-	int				neol;		/* number of $ used */
-	int				ncategories;/* how many character categories */
-	cat_t		   *categories; /* ->catspace[-CHAR_MIN] */
-	char		   *must;		/* match must contain this string */
-	int				mlen;		/* length of must */
-	size_t			nsub;		/* copy of re_nsub */
-	int				backrefs;	/* does it use back references? */
-	sopno			nplus;		/* how deep does it nest +s? */
+	int			nbol;			/* number of ^ used */
+	int			neol;			/* number of $ used */
+	int			ncategories;	/* how many character categories */
+	cat_t	   *categories;		/* ->catspace[-CHAR_MIN] */
+	char	   *must;			/* match must contain this string */
+	int			mlen;			/* length of must */
+	size_t		nsub;			/* copy of re_nsub */
+	int			backrefs;		/* does it use back references? */
+	sopno		nplus;			/* how deep does it nest +s? */
 	/* catspace must be last */
-	cat_t			catspace[1];/* actually [NC] */
+	cat_t		catspace[1];	/* actually [NC] */
 };
 
 /* misc utilities */
diff --git a/src/include/regex/regexp.h b/src/include/regex/regexp.h
index cbbb26367df..d8008190708 100644
--- a/src/include/regex/regexp.h
+++ b/src/include/regex/regexp.h
@@ -49,14 +49,14 @@
 #define NSUBEXP  10
 typedef struct regexp
 {
-	char		   *startp[NSUBEXP];
-	char		   *endp[NSUBEXP];
-	char			regstart;	/* Internal use only. */
-	char			reganch;	/* Internal use only. */
-	char		   *regmust;	/* Internal use only. */
-	int				regmlen;	/* Internal use only. */
-	char			program[1]; /* Unwarranted chumminess with compiler. */
-}				regexp;
+	char	   *startp[NSUBEXP];
+	char	   *endp[NSUBEXP];
+	char		regstart;		/* Internal use only. */
+	char		reganch;		/* Internal use only. */
+	char	   *regmust;		/* Internal use only. */
+	int			regmlen;		/* Internal use only. */
+	char		program[1];		/* Unwarranted chumminess with compiler. */
+}			regexp;
 
 /* since not all systems have cdefs.h, we'll use our own here - jolly */