Final cleanup.

18 files changed, 94 insertions, 92 deletions

diff --git a/src/backend/commands/_deadcode/recipe.c b/src/backend/commands/_deadcode/recipe.c
index eba92e11e0a..e390b03fe82 100644
--- a/src/backend/commands/_deadcode/recipe.c
+++ b/src/backend/commands/_deadcode/recipe.c
@@ -7,28 +7,28 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.6 1999/07/16 03:12:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.7 1999/07/16 04:58:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/parsenodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/execnodes.h"
-#include "nodes/makefuncs.h"
 #include "catalog/pg_type.h"
 #include "commands/recipe.h"
+#include "executor/executor.h"
 #include "libpq/libpq-be.h"
+#include "nodes/execnodes.h"
+#include "nodes/makefuncs.h"
+#include "nodes/parsenodes.h"
+#include "nodes/plannodes.h"
+#include "optimizer/planner.h"
 #include "parser/parse_node.h"
-#include "utils/builtins.h"
-#include "utils/relcache.h"
 #include "rewrite/rewriteHandler.h"
 #include "rewrite/rewriteManip.h"
-#include "tcop/pquery.h"
 #include "tcop/dest.h"
-#include "optimizer/planner.h"
-#include "executor/executor.h"
+#include "tcop/pquery.h"
+#include "utils/builtins.h"
+#include "utils/relcache.h"
 
 /* from tcop/postgres.c */
 extern CommandDest whereToSendOutput;
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 24e5e86cd57..7fa337c196f 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.50 1999/07/16 03:12:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.51 1999/07/16 04:58:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -85,17 +85,17 @@
 
 #include "postgres.h"
 
-#include "commands/async.h"
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_listener.h"
+#include "commands/async.h"
 #include "lib/dllist.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
+#include "utils/ps_status.h"
 #include "utils/syscache.h"
 #include "utils/trace.h"
-#include "utils/ps_status.h"
 
 /* stuff that we really ought not be touching directly :-( */
 extern TransactionState CurrentTransactionState;
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index f1fbe352915..a02aba5fa05 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.42 1999/07/15 23:03:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.43 1999/07/16 04:58:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,19 +22,17 @@
 
 #include "postgres.h"
 
-#include "catalog/heap.h"
-#include "access/heapam.h"
 #include "access/genam.h"
-#include "utils/syscache.h"
+#include "access/heapam.h"
+#include "catalog/heap.h"
 #include "catalog/index.h"
+#include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "commands/cluster.h"
 #include "commands/rename.h"
-#include "utils/builtins.h"
-#include "catalog/pg_proc.h"
 #include "optimizer/internal.h"
-#ifndef NO_SECURITY
-#endif	 /* !NO_SECURITY */
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 static Relation copy_heap(Oid OIDOldHeap);
 static void copy_index(Oid OIDOldIndex, Oid OIDNewHeap);
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index c39db896e65..ef6f25efd44 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.50 1999/07/15 23:03:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.51 1999/07/16 04:58:38 momjian Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -20,23 +20,23 @@
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "catalog/indexing.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
+#include "catalog/indexing.h"
 #include "catalog/pg_type.h"
 #include "commands/command.h"
 #include "executor/execdefs.h"
 #include "executor/executor.h"
+#include "miscadmin.h"
 #include "optimizer/prep.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
-#include "utils/temprel.h"
 #include "utils/syscache.h"
-#include "miscadmin.h"
-#include <string.h>
+#include "utils/temprel.h"
 
 /* ----------------
  *		PortalExecutorHeapMemory stuff
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 196785265a4..9d649fb1456 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,34 +6,35 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.83 1999/07/15 23:03:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.84 1999/07/16 04:58:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #include "postgres.h"
 
-#include "access/heapam.h"
-#include "miscadmin.h"
-#include "utils/builtins.h"
-#include "utils/acl.h"
-#include <sys/stat.h>
-#include "catalog/pg_index.h"
-#include "utils/syscache.h"
-#include "executor/executor.h"
-#include "catalog/index.h"
 #include "access/genam.h"
-#include "catalog/pg_type.h"
+#include "access/heapam.h"
 #include "catalog/catname.h"
+#include "catalog/index.h"
+#include "catalog/pg_index.h"
 #include "catalog/pg_shadow.h"
+#include "catalog/pg_type.h"
 #include "commands/copy.h"
 #include "commands/trigger.h"
+#include "executor/executor.h"
 #include "libpq/libpq.h"
+#include "miscadmin.h"
+#include "utils/acl.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 #ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
 #endif
 
 #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index 64ed30974d7..d5177d86627 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.43 1999/07/15 23:03:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.44 1999/07/16 04:58:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,14 +16,14 @@
 
 #include "postgres.h"
 
-#include "catalog/heap.h"
-#include "commands/creatinh.h"
 #include "access/heapam.h"
-#include "utils/syscache.h"
 #include "catalog/catname.h"
-#include "catalog/pg_type.h"
+#include "catalog/heap.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_ipl.h"
+#include "catalog/pg_type.h"
+#include "commands/creatinh.h"
+#include "utils/syscache.h"
 
 /* ----------------
  *		local stuff
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 8a2b92344ad..2e420d2f518 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.37 1999/07/16 03:12:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.38 1999/07/16 04:58:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,9 +22,9 @@
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_shadow.h"
+#include "commands/dbcommands.h"
 #include "miscadmin.h"
 #include "tcop/tcopprot.h"
-#include "commands/dbcommands.h"
 #include "utils/syscache.h"
 
 
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 298c6655692..5bf42d182ee 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.32 1999/07/16 03:12:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.33 1999/07/16 04:58:40 momjian Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -42,17 +42,17 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_aggregate.h"
+#include "catalog/pg_language.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
+#include "catalog/pg_shadow.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_language.h"
-#include "utils/syscache.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
 #include "commands/defrem.h"
-#include "tcop/dest.h"
-#include "catalog/pg_shadow.h"
+#include "fmgr.h"
 #include "optimizer/cost.h"
+#include "tcop/dest.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 static char *defGetString(DefElem *def);
 static int	defGetTypeLength(DefElem *def);
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index c4ccf2db0de..9e416b9f2b9 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994-5, Regents of the University of California
  *
- *	  $Id: explain.c,v 1.40 1999/07/15 23:03:08 momjian Exp $
+ *	  $Id: explain.c,v 1.41 1999/07/16 04:58:40 momjian Exp $
  *
  */
 #include <stdio.h>
@@ -12,13 +12,13 @@
 
 #include "postgres.h"
 
-#include "nodes/print.h"
-#include "lib/stringinfo.h"
 #include "commands/explain.h"
-#include "parser/parsetree.h"
+#include "lib/stringinfo.h"
+#include "nodes/print.h"
 #include "optimizer/planner.h"
-#include "utils/relcache.h"
+#include "parser/parsetree.h"
 #include "rewrite/rewriteHandler.h"
+#include "utils/relcache.h"
 
 typedef struct ExplainState
 {
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 7932bcf6d6c..69297201189 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.7 1999/07/16 03:12:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.8 1999/07/16 04:58:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,18 +17,18 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "utils/builtins.h"
-#include "utils/syscache.h"
 #include "catalog/heap.h"
 #include "catalog/index.h"
 #include "catalog/pg_index.h"
+#include "catalog/pg_opclass.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_opclass.h"
 #include "commands/defrem.h"
-#include "parser/parsetree.h"
-#include "optimizer/prep.h"
 #include "optimizer/clauses.h"
+#include "optimizer/prep.h"
+#include "parser/parsetree.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 #define IsFuncIndex(ATTR_LIST) (((IndexElem*)lfirst(ATTR_LIST))->args!=NULL)
 
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index e28156aaa8a..0ae6b151bae 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.34 1999/07/15 22:39:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.35 1999/07/16 04:58:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,6 +25,7 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index c73dbe19a0c..e27c06f2b3d 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,10 +7,16 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.29 1999/07/16 03:12:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.30 1999/07/16 04:58:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
+#else
+#include <string.h>
+#endif
+
 #include "postgres.h"
 
 #include "access/heapam.h"
@@ -22,13 +28,7 @@
 #include "commands/rename.h"
 #include "miscadmin.h"
 #include "optimizer/prep.h"
-#ifndef NO_SECURITY
 #include "utils/acl.h"
-#endif	 /* !NO_SECURITY */
-#ifndef HAVE_MEMMOVE
-#else
-#include <string.h>
-#endif
 
 /*
  *		renameatt		- changes the name of a attribute in a relation
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 4efc85c41a4..548b3311a07 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -9,13 +9,13 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 
 #include "access/heapam.h"
 #include "commands/creatinh.h"
 #include "commands/sequence.h"
-#include "utils/builtins.h"
+#include "miscadmin.h"
 #include "utils/acl.h"
+#include "utils/builtins.h"
 
 #define SEQ_MAGIC	  0x1717
 
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 6107c4bd6fa..35b3356de4d 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -8,6 +8,7 @@
 #include <string.h>
 #include "postgres.h"
 
+
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "catalog/catalog.h"
@@ -17,15 +18,12 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_trigger.h"
 #include "commands/trigger.h"
-#include "utils/inval.h"
-#include "utils/builtins.h"
-#include "utils/syscache.h"
 #include "executor/executor.h"
-
-#ifndef NO_SECURITY
 #include "miscadmin.h"
 #include "utils/acl.h"
-#endif
+#include "utils/builtins.h"
+#include "utils/inval.h"
+#include "utils/syscache.h"
 
 DLLIMPORT TriggerData *CurrentTriggerData = NULL;
 
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 152c57f752d..63de3aa699b 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: user.c,v 1.30 1999/07/15 23:03:08 momjian Exp $
+ * $Id: user.c,v 1.31 1999/07/16 04:58:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,16 +18,16 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
+#include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_shadow.h"
+#include "commands/user.h"
 #include "libpq/crypt.h"
-#include "access/heapam.h"
+#include "miscadmin.h"
 #include "tcop/tcopprot.h"
 #include "utils/acl.h"
 #include "utils/syscache.h"
-#include "commands/user.h"
 
 static void CheckPgUserAclNotNull(void);
 
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 2c8cf527ac5..91ce729ebda 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.112 1999/07/15 22:39:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.113 1999/07/16 04:58:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "catalog/catalog.h"
@@ -30,6 +29,7 @@
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
 #include "commands/vacuum.h"
+#include "miscadmin.h"
 #include "parser/parse_oper.h"
 #include "storage/smgr.h"
 #include "utils/builtins.h"
@@ -39,6 +39,7 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_GETRUSAGE
+#include "rusagestub.h"
 #else
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 094bec33e83..6669eb7440e 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -2,7 +2,7 @@
  * Routines for handling of 'SET var TO',
  *	'SHOW var' and 'RESET var' statements.
  *
- * $Id: variable.c,v 1.23 1999/07/07 09:36:45 momjian Exp $
+ * $Id: variable.c,v 1.24 1999/07/16 04:58:41 momjian Exp $
  *
  */
 
@@ -10,16 +10,19 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
+
 #include "postgres.h"
-#include "miscadmin.h"
+#include "access/xact.h"
 #include "commands/variable.h"
-#include "utils/builtins.h"
+#include "miscadmin.h"
 #include "optimizer/internal.h"
-#include "access/xact.h"
+#include "utils/builtins.h"
 #include "utils/tqual.h"
+
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
 #endif
+
 static bool show_date(void);
 static bool reset_date(void);
 static bool parse_date(const char *);
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index c71ee85b012..069d92237b8 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: view.c,v 1.35 1999/07/15 23:03:08 momjian Exp $
+ *	$Id: view.c,v 1.36 1999/07/16 04:58:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,15 +14,15 @@
 
 #include "postgres.h"
 
-#include "catalog/heap.h"
 #include "access/xact.h"
+#include "catalog/heap.h"
+#include "commands/creatinh.h"
+#include "commands/view.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_type.h"
 #include "rewrite/rewriteDefine.h"
 #include "rewrite/rewriteManip.h"
 #include "rewrite/rewriteRemove.h"
-#include "commands/creatinh.h"
-#include "commands/view.h"
 
 /*---------------------------------------------------------------------
  * DefineVirtualRelation