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

1 files changed, 112 insertions, 115 deletions

diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index b59e4d8299..cf50bee06e 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_dump.h,v 1.20 1997/09/07 04:54:42 momjian Exp $
+ * $Id: pg_dump.h,v 1.21 1997/09/08 02:32:50 momjian Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -26,142 +26,139 @@
 
 typedef struct _typeInfo
 {
-	char		   *oid;
-	char		   *typowner;
-	char		   *typname;
-	char		   *typlen;
-	char		   *typprtlen;
-	char		   *typinput;
-	char		   *typoutput;
-	char		   *typreceive;
-	char		   *typsend;
-	char		   *typelem;
-	char		   *typdelim;
-	char		   *typdefault;
-	char		   *typrelid;
-	char		   *usename;
-	int				passedbyvalue;
-	int				isArray;
-}				TypeInfo;
+	char	   *oid;
+	char	   *typowner;
+	char	   *typname;
+	char	   *typlen;
+	char	   *typprtlen;
+	char	   *typinput;
+	char	   *typoutput;
+	char	   *typreceive;
+	char	   *typsend;
+	char	   *typelem;
+	char	   *typdelim;
+	char	   *typdefault;
+	char	   *typrelid;
+	char	   *usename;
+	int			passedbyvalue;
+	int			isArray;
+}			TypeInfo;
 
 typedef struct _funcInfo
 {
-	char		   *oid;
-	char		   *proname;
-	char		   *proowner;
-	int				lang;		/* 1 if C, else SQL */
-	int				nargs;
-	char		   *argtypes[8];/* should be derived from obj/fmgr.h
+	char	   *oid;
+	char	   *proname;
+	char	   *proowner;
+	int			lang;			/* 1 if C, else SQL */
+	int			nargs;
+	char	   *argtypes[8];	/* should be derived from obj/fmgr.h
 								 * instead of hardwired */
-	char		   *prorettype;
-	int				retset;		/* 1 if the function returns a set, 0
+	char	   *prorettype;
+	int			retset;			/* 1 if the function returns a set, 0
 								 * otherwise */
-	char		   *prosrc;
-	char		   *probin;
-	char		   *usename;
-	int				dumped;		/* 1 if already dumped */
-}				FuncInfo;
+	char	   *prosrc;
+	char	   *probin;
+	char	   *usename;
+	int			dumped;			/* 1 if already dumped */
+}			FuncInfo;
 
 typedef struct _tableInfo
 {
-	char		   *oid;
-	char		   *relname;
-	char		   *relarch;
-	char		   *relacl;
-	bool			sequence;
-	int				numatts;	/* number of attributes */
-	int			   *inhAttrs;	/* an array of flags, one for each
+	char	   *oid;
+	char	   *relname;
+	char	   *relarch;
+	char	   *relacl;
+	bool		sequence;
+	int			numatts;		/* number of attributes */
+	int		   *inhAttrs;		/* an array of flags, one for each
 								 * attribute if the value is 1, then this
 								 * attribute is an inherited attribute */
-	char		  **attnames;	/* the attribute names */
-	char		  **typnames;	/* fill out attributes */
-	bool		   *notnull;	/* Not null constraints of an attribute */
-	int				numParents; /* number of (immediate) parent
+	char	  **attnames;		/* the attribute names */
+	char	  **typnames;		/* fill out attributes */
+	bool	   *notnull;		/* Not null constraints of an attribute */
+	int			numParents;		/* number of (immediate) parent
 								 * supertables */
-	char		  **parentRels; /* names of parent relations, NULL if
+	char	  **parentRels;		/* names of parent relations, NULL if
 								 * numParents == 0 */
-	char		  **out_attnames;		/* the attribute names, in the
-										 * order they would be in, when
-										 * the table is created in the
-										 * target query language. this is
-										 * needed because the SQL tables
-										 * will not have the same order of
-										 * attributes as the POSTQUEL
-										 * tables */
-	int			   *attlen;		/* attribute lengths */
-	char		   *usename;
-
-}				TableInfo;
+	char	  **out_attnames;	/* the attribute names, in the order they
+								 * would be in, when the table is created
+								 * in the target query language. this is
+								 * needed because the SQL tables will not
+								 * have the same order of attributes as
+								 * the POSTQUEL tables */
+	int		   *attlen;			/* attribute lengths */
+	char	   *usename;
+
+}			TableInfo;
 
 typedef struct _inhInfo
 {
-	char		   *inhrel;
-	char		   *inhparent;
-}				InhInfo;
+	char	   *inhrel;
+	char	   *inhparent;
+}			InhInfo;
 
 typedef struct _indInfo
 {
-	char		   *indexrelname;		/* name of the secondary index
-										 * class */
-	char		   *indrelname; /* name of the indexed heap class */
-	char		   *indamname;	/* name of the access method (e.g. btree,
+	char	   *indexrelname;	/* name of the secondary index class */
+	char	   *indrelname;		/* name of the indexed heap class */
+	char	   *indamname;		/* name of the access method (e.g. btree,
 								 * rtree, etc.) */
-	char		   *indproc;	/* oid of the function to compute the
+	char	   *indproc;		/* oid of the function to compute the
 								 * index, 0 if none */
-	char		   *indkey[INDEX_MAX_KEYS];		/* attribute numbers of
-												 * the key attributes */
-	char		   *indclass[INDEX_MAX_KEYS];	/* opclass of the keys */
-	char		   *indisunique;/* is this index unique? */
-}				IndInfo;
+	char	   *indkey[INDEX_MAX_KEYS]; /* attribute numbers of the key
+										 * attributes */
+	char	   *indclass[INDEX_MAX_KEYS];		/* opclass of the keys */
+	char	   *indisunique;	/* is this index unique? */
+}			IndInfo;
 
 typedef struct _aggInfo
 {
-	char		   *oid;
-	char		   *aggname;
-	char		   *aggtransfn1;
-	char		   *aggtransfn2;
-	char		   *aggfinalfn;
-	char		   *aggtranstype1;
-	char		   *aggbasetype;
-	char		   *aggtranstype2;
-	char		   *agginitval1;
-	char		   *agginitval2;
-	char		   *usename;
-}				AggInfo;
+	char	   *oid;
+	char	   *aggname;
+	char	   *aggtransfn1;
+	char	   *aggtransfn2;
+	char	   *aggfinalfn;
+	char	   *aggtranstype1;
+	char	   *aggbasetype;
+	char	   *aggtranstype2;
+	char	   *agginitval1;
+	char	   *agginitval2;
+	char	   *usename;
+}			AggInfo;
 
 typedef struct _oprInfo
 {
-	char		   *oid;
-	char		   *oprname;
-	char		   *oprkind;	/* "b" = binary, "l" = left unary, "r" =
+	char	   *oid;
+	char	   *oprname;
+	char	   *oprkind;		/* "b" = binary, "l" = left unary, "r" =
 								 * right unary */
-	char		   *oprcode;	/* operator function name */
-	char		   *oprleft;	/* left operand type */
-	char		   *oprright;	/* right operand type */
-	char		   *oprcom;		/* oid of the commutator operator */
-	char		   *oprnegate;	/* oid of the negator operator */
-	char		   *oprrest;	/* name of the function to calculate
+	char	   *oprcode;		/* operator function name */
+	char	   *oprleft;		/* left operand type */
+	char	   *oprright;		/* right operand type */
+	char	   *oprcom;			/* oid of the commutator operator */
+	char	   *oprnegate;		/* oid of the negator operator */
+	char	   *oprrest;		/* name of the function to calculate
 								 * operator restriction selectivity */
-	char		   *oprjoin;	/* name of the function to calculate
+	char	   *oprjoin;		/* name of the function to calculate
 								 * operator join selectivity */
-	char		   *oprcanhash; /* can we use hash join strategy ? */
-	char		   *oprlsortop; /* oid's of the left and right sort
+	char	   *oprcanhash;		/* can we use hash join strategy ? */
+	char	   *oprlsortop;		/* oid's of the left and right sort
 								 * operators */
-	char		   *oprrsortop;
-	char		   *usename;
-}				OprInfo;
+	char	   *oprrsortop;
+	char	   *usename;
+}			OprInfo;
 
 
 /* global decls */
-extern bool		g_verbose;		/* verbose flag */
-extern int		g_last_builtin_oid;		/* value of the last builtin oid */
-extern FILE    *g_fout;			/* the script file */
+extern bool g_verbose;			/* verbose flag */
+extern int	g_last_builtin_oid; /* value of the last builtin oid */
+extern FILE *g_fout;			/* the script file */
 
 /* placeholders for comment starting and ending delimiters */
-extern char		g_comment_start[10];
-extern char		g_comment_end[10];
+extern char g_comment_start[10];
+extern char g_comment_end[10];
 
-extern char		g_opaque_type[10];		/* name for the opaque type */
+extern char g_opaque_type[10];	/* name for the opaque type */
 
 /* pg_dump is really two programs in one
 	one version works with postgres v4r2
@@ -184,14 +181,14 @@ dumpSchemaIdx(FILE * fout,
 			  TableInfo * tblinfo,
 			  int numTables);
 
-extern char    *findTypeByOid(TypeInfo * tinfo, int numTypes, const char *oid);
-extern char    *findOprByOid(OprInfo * oprinfo, int numOprs, const char *oid);
-extern int		findFuncByName(FuncInfo * finfo, int numFuncs, const char *name);
-extern int		findTableByName(TableInfo * tbinfo, int numTables, const char *relname);
+extern char *findTypeByOid(TypeInfo * tinfo, int numTypes, const char *oid);
+extern char *findOprByOid(OprInfo * oprinfo, int numOprs, const char *oid);
+extern int	findFuncByName(FuncInfo * finfo, int numFuncs, const char *name);
+extern int	findTableByName(TableInfo * tbinfo, int numTables, const char *relname);
 
-extern void		check_conn_and_db(void);
-extern void		parseArgTypes(char **argtypes, const char *str);
-extern int		isArchiveName(const char *);
+extern void check_conn_and_db(void);
+extern void parseArgTypes(char **argtypes, const char *str);
+extern int	isArchiveName(const char *);
 
 /*
  * version specific routines
@@ -200,17 +197,17 @@ extern TypeInfo *getTypes(int *numTypes);
 extern FuncInfo *getFuncs(int *numFuncs);
 extern AggInfo *getAggregates(int *numAggregates);
 
-extern void		clearAggInfo(AggInfo *, int);
-extern void		clearFuncInfo(FuncInfo *, int);
-extern void		clearInhInfo(InhInfo *, int);
-extern void		clearIndInfo(IndInfo *, int);
-extern void		clearOprInfo(OprInfo *, int);
-extern void		clearTypeInfo(TypeInfo *, int);
+extern void clearAggInfo(AggInfo *, int);
+extern void clearFuncInfo(FuncInfo *, int);
+extern void clearInhInfo(InhInfo *, int);
+extern void clearIndInfo(IndInfo *, int);
+extern void clearOprInfo(OprInfo *, int);
+extern void clearTypeInfo(TypeInfo *, int);
 
 extern OprInfo *getOperators(int *numOperators);
 extern TableInfo *getTables(int *numTables);
 extern InhInfo *getInherits(int *numInherits);
-extern void		getTableAttrs(TableInfo * tbinfo, int numTables);
+extern void getTableAttrs(TableInfo * tbinfo, int numTables);
 extern IndInfo *getIndices(int *numIndices);
 extern void
 dumpTypes(FILE * fout, FuncInfo * finfo, int numFuncs,