Fix a passel of recently-committed violations of the rule 'thou shalt

have no other gods before c.h'.  Also remove some demonstrably redundant
#include lines, mostly of <errno.h> which was added to c.h years ago.

diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index a6a03c8995bf2f262b3df94e19db2cd7dc28afce..639b575cb3f7fa4a1afe1a839f8c26eb969a47d0 100644 (file)
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -1,7 +1,8 @@
+#include "btree_gist.h"
+
 #include <math.h>
 #include <float.h>
 
-#include "btree_gist.h"
 #include "btree_utils_var.h"
 #include "utils/builtins.h"
 #include "utils/numeric.h"

diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h
index 1ea022e90f55d02086b8f0a11955ac2c7f78f92f..dcaa94bbeeee4b4b092ca0dce3c2d42cbd15bea3 100644 (file)
--- a/contrib/btree_gist/btree_utils_num.h
+++ b/contrib/btree_gist/btree_utils_num.h
@@ -1,11 +1,11 @@
 #ifndef __BTREE_UTILS_NUM_H__
 #define __BTREE_UTILS_NUM_H__
 
+#include "btree_gist.h"
+
 #include <math.h>
 #include <float.h>
 
-#include "btree_gist.h"
-
 typedef char GBT_NUMKEY;
 
 /* Better readable key */

diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 1a6f1fdadfe4bef3ab1834f144684aeebf6a96b5..1f5ea126920a19e95bbd62759451df271bc0d206 100644 (file)
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -1,8 +1,9 @@
+#include "btree_gist.h"
+
 #include <math.h>
 #include <limits.h>
 #include <float.h>
 
-#include "btree_gist.h"
 #include "btree_utils_var.h"
 #include "utils/pg_locale.h"
 #include "utils/builtins.h"

diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h
index 21a6cbd8e273b6019d76e075de2d1e2af6dd34fd..0c723e91ac31e92ca4e11e8147edc10de10c9cbc 100644 (file)
--- a/contrib/btree_gist/btree_utils_var.h
+++ b/contrib/btree_gist/btree_utils_var.h
@@ -1,10 +1,10 @@
 #ifndef __BTREE_UTILS_VAR_H__
 #define __BTREE_UTILS_VAR_H__
 
-#include "mb/pg_wchar.h"
-
 #include "btree_gist.h"
 
+#include "mb/pg_wchar.h"
+
 /* Variable length key */
 typedef bytea GBT_VARKEY;
 

diff --git a/contrib/chkpass/chkpass.c b/contrib/chkpass/chkpass.c
index e8ad19971159c4e765595a11bdaecacbd961c98c..9a92ca71b0dccd82c3f74a8040699b02487af278 100644 (file)
--- a/contrib/chkpass/chkpass.c
+++ b/contrib/chkpass/chkpass.c
@@ -10,8 +10,6 @@
 
 #include "postgres.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
 #include <unistd.h>
 #ifdef HAVE_CRYPT_H

diff --git a/contrib/fuzzystrmatch/dmetaphone.c b/contrib/fuzzystrmatch/dmetaphone.c
index 850954343385b4f874fa4f9e6e757cbeb9517143..9690132c7ac8d9717e583e51ef1627b994bda7a5 100644 (file)
--- a/contrib/fuzzystrmatch/dmetaphone.c
+++ b/contrib/fuzzystrmatch/dmetaphone.c
@@ -50,7 +50,7 @@
 
 
 /*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  * $Id$
  */
 
@@ -106,8 +106,8 @@ The remaining code is authored by Andrew Dunstan <amdunstan@ncshp.org> and
 #ifndef DMETAPHONE_MAIN
 
 #include "postgres.h"
+
 #include "fmgr.h"
-#include "utils/elog.h"
 
 /* turn off assertions for embedded function */
 #define NDEBUG

diff --git a/contrib/pg_trgm/trgm.h b/contrib/pg_trgm/trgm.h
index d6ba0405053625a9cdad3e4dabfb3e4c84c5b468..b7674c52b583c35c299a81ceb46ab9962d35b33c 100644 (file)
--- a/contrib/pg_trgm/trgm.h
+++ b/contrib/pg_trgm/trgm.h
@@ -6,8 +6,6 @@
 #include "access/gist.h"
 #include "access/itup.h"
 #include "utils/builtins.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "storage/bufpage.h"
 
 /* options */

diff --git a/contrib/tsearch2/common.c b/contrib/tsearch2/common.c
index 35fb9ffcb8a78555f236379524f7cbdffdfc886c..6192821344370785bc6d1e00e978894956875e85 100644 (file)
--- a/contrib/tsearch2/common.c
+++ b/contrib/tsearch2/common.c
@@ -1,6 +1,5 @@
 #include "postgres.h"
 
-#include "postgres.h"
 #include "fmgr.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_proc.h"

diff --git a/contrib/tsearch2/gendict/dict_snowball.c.IN b/contrib/tsearch2/gendict/dict_snowball.c.IN
index 7d080fb447fab18cae1af1ef53852e410db0f4f1..57289458eae3573e3fc8c09e4dd336f777efefa5 100644 (file)
--- a/contrib/tsearch2/gendict/dict_snowball.c.IN
+++ b/contrib/tsearch2/gendict/dict_snowball.c.IN
@@ -5,9 +5,6 @@
  * http://snowball.tartarus.org/ 
  * Teodor Sigaev <teodor@sigaev.ru>
  */
-#include <stdlib.h>
-#include <string.h>
-
 #include "postgres.h"
 
 #include "dict.h"

diff --git a/contrib/tsearch2/gendict/dict_tmpl.c.IN b/contrib/tsearch2/gendict/dict_tmpl.c.IN
index b473dd86310f11af7f1a6fb37176c5a66b0885be..47d320d64fe6aff3cba16f35c88431cdf4dcd8c2 100644 (file)
--- a/contrib/tsearch2/gendict/dict_tmpl.c.IN
+++ b/contrib/tsearch2/gendict/dict_tmpl.c.IN
@@ -4,10 +4,6 @@
  * example of dictionary 
  * Teodor Sigaev <teodor@sigaev.ru>
  */
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "postgres.h"
 
 #include "dict.h"

diff --git a/contrib/tsearch2/ispell/regis.c b/contrib/tsearch2/ispell/regis.c
index 20b6bddecf658afaf570d09e291bb6cfcb099e4a..4be863431d1bd895a89665fd94d56fb47f5e41d9 100644 (file)
--- a/contrib/tsearch2/ispell/regis.c
+++ b/contrib/tsearch2/ispell/regis.c
@@ -1,7 +1,3 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "regis.h"
 #include "ts_locale.h"
 #include "common.h"

diff --git a/contrib/tsearch2/ispell/spell.c b/contrib/tsearch2/ispell/spell.c
index 28f38eefd32b71aaa85aeee5c5987f46686e1eb8..4e199f4bc07a6cc5f18494a7abd827ac4866661c 100644 (file)
--- a/contrib/tsearch2/ispell/spell.c
+++ b/contrib/tsearch2/ispell/spell.c
@@ -1,10 +1,7 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
 #include "postgres.h"
 
+#include <ctype.h>
+
 #include "spell.h"
 #include "common.h"
 #include "ts_locale.h"

diff --git a/contrib/tsearch2/ispell/spell.h b/contrib/tsearch2/ispell/spell.h
index fe79888bf3ec00b6fd09e0d1b7c6d634edc50c0e..5734881947e9b6a1309108783a0920b926b3e323 100644 (file)
--- a/contrib/tsearch2/ispell/spell.h
+++ b/contrib/tsearch2/ispell/spell.h
@@ -1,9 +1,11 @@
 #ifndef __SPELL_H__
 #define __SPELL_H__
 
+#include "c.h"
+
 #include <sys/types.h>
+
 #include "regex/regex.h"
-#include "c.h"
 
 #include "regis.h"
 #include "dict.h"

diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index d38faa71a586c15ddaa6c8558a7c0e480a60ff7d..db7c2ef697cae49b79fd56e2780b33fe0ff75fdf 100644 (file)
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -17,10 +17,10 @@
  *             ExecInitSubPlan - initialize a subselect
  *             ExecEndSubPlan  - shut down a subselect
  */
-#include <math.h>
-
 #include "postgres.h"
 
+#include <math.h>
+
 #include "access/heapam.h"
 #include "executor/executor.h"
 #include "executor/nodeSubplan.h"

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index c9aebcff05042c1ccf11f133426e6223eabf3c26..625abd96e669762107d9a5ade1d4d9867989c692 100644 (file)
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -20,7 +20,6 @@
 #if defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || defined(HAVE_STRUCT_SOCKCRED)
 #include <sys/uio.h>
 #include <sys/ucred.h>
-#include <errno.h>
 #endif
 #include <netinet/in.h>
 #include <arpa/inet.h>

diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index c495ad0dccd6128c38bacdc3eb8485638411b52a..d87c57fe6550e91da2bc5de3c6691fb3f2f76a1b 100644 (file)
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -66,7 +66,6 @@
 #include "postgres.h"
 
 #include <signal.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <unistd.h>

diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index 645b2ee653eb3c2f45271c9f166c5ea122c76872..79e8b1f393f7f0da2f69f876eb05491912f33423 100644 (file)
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -69,7 +69,6 @@
 
 #include "postgres.h"
 
-#include <errno.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c
index 3ace7fc39153b7b50795ac830aa884e2d081bad1..64aca56ee2869a0c1ddbc049c6ea32e138a98dcb 100644 (file)
--- a/src/backend/port/dynloader/aix.c
+++ b/src/backend/port/dynloader/aix.c
@@ -6,7 +6,6 @@
 
 #include "postgres.h"
 
-#include <errno.h>
 #include "sys/ldr.h"
 #include <a.out.h>
 #include "ldfcn.h"

diff --git a/src/backend/port/ipc_test.c b/src/backend/port/ipc_test.c
index 524c37fac08b531f73dc30d904ebce5c4bf26dba..3d8cb4f5282c6a233edcbbc2a0d9a01d1b68746d 100644 (file)
--- a/src/backend/port/ipc_test.c
+++ b/src/backend/port/ipc_test.c
@@ -27,7 +27,6 @@
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <unistd.h>
 
 #include "miscadmin.h"

diff --git a/src/backend/port/posix_sema.c b/src/backend/port/posix_sema.c
index a6aaa3243662bb374497b7da6d21a9efb7ba749b..42d8fc950e902a15efc31cb4bb07b1f537fddca7 100644 (file)
--- a/src/backend/port/posix_sema.c
+++ b/src/backend/port/posix_sema.c
@@ -17,7 +17,6 @@
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>

diff --git a/src/backend/port/sysv_sema.c b/src/backend/port/sysv_sema.c
index 76ce4954f860c96d73e134495fca4c03a3a44561..4ece86e0394941fe6f966de5754400f797364a87 100644 (file)
--- a/src/backend/port/sysv_sema.c
+++ b/src/backend/port/sysv_sema.c
@@ -14,7 +14,6 @@
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <unistd.h>
 #include <sys/file.h>

diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
index 0f63a8a24b8a6d35abbe41a2fb73f52cf9a7e1b1..7f21f1db4060e0b880b99613a94acb68b8172830 100644 (file)
--- a/src/backend/port/sysv_shmem.c
+++ b/src/backend/port/sysv_shmem.c
@@ -16,7 +16,6 @@
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <unistd.h>
 #include <sys/file.h>

diff --git a/src/backend/port/win32/shmem.c b/src/backend/port/win32/shmem.c
index bff318266d1f3fec6f8f9422403337c7c73e4f82..1755b7248f4c727f5c9d3d7a8aaf5684fd483bbd 100644 (file)
--- a/src/backend/port/win32/shmem.c
+++ b/src/backend/port/win32/shmem.c
@@ -13,9 +13,6 @@
 
 #include "postgres.h"
 
-#include <stdio.h>
-#include <errno.h>
-
 static DWORD s_segsize = 0;
 
 /* Detach from a shared mem area based on its address */

diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index bb7ede97a2fb81476ad92ab14a86f9e35b77c175..6377f59139c4b66fd9a9f00d2297a3ab755a2b3b 100644 (file)
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -34,8 +34,6 @@
 
 #include "postgres.h"
 
-#include <errno.h>
-
 #include "storage/fd.h"
 #include "storage/buffile.h"
 

diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c
index 77e4eef36fad2885ba355ee58ca2318e21293437..370db3a76881590af1e06211201b35ac9898846c 100644 (file)
--- a/src/backend/storage/freespace/freespace.c
+++ b/src/backend/storage/freespace/freespace.c
@@ -58,7 +58,6 @@
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <limits.h>
 #include <math.h>
 #include <unistd.h>

diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 1f7962aebe9c75c7f5f18db92baac28a901f6663..ec87b69e18aaf3bc60726443e5f27fc57a9b78c9 100644 (file)
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -19,7 +19,6 @@
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <unistd.h>
 

diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 423b19d222ad17759297cdb79fc804cb5265e0c7..64f0321b27cd1be1c9491c1257cfcc01aa5ddffe 100644 (file)
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -14,7 +14,6 @@
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/file.h>

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index cf2de3ca22f08cbf8ce738c81538a2894ec47091..d0441119df9ac806d5b9df25045719d511fe0ec4 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -15,7 +15,6 @@
 #include "postgres.h"
 
 #include <ctype.h>
-#include <errno.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>

diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 08247370ffddc7a9ad90bf4821a2eeece65a17fd..2b87a675fab23f6bb0933927ff135f2c0374497a 100644 (file)
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -53,7 +53,6 @@
 #include "postgres.h"
 
 #include <ctype.h>
-#include <errno.h>
 #include <float.h>
 #include <math.h>
 #include <limits.h>

diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index a385deeeec3f7a7f7607fc17795dbfb5a15c914a..7be72cd61ef193036ab39fd6839dfd0f929dbd2f 100644 (file)
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -25,7 +25,6 @@
 #include <float.h>
 #include <limits.h>
 #include <math.h>
-#include <errno.h>
 
 #include "catalog/pg_type.h"
 #include "libpq/pqformat.h"

diff --git a/src/backend/utils/adt/pg_lzcompress.c b/src/backend/utils/adt/pg_lzcompress.c
index 7a97791c71444298d2c283191957bd0c817f3631..735c16a82a09ff2ac77f01d0b6039687b22df2b9 100644 (file)
--- a/src/backend/utils/adt/pg_lzcompress.c
+++ b/src/backend/utils/adt/pg_lzcompress.c
@@ -175,7 +175,6 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include <errno.h>
 
 #include "utils/pg_lzcompress.h"
 

diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 6b83dbe2846b0a0546fd14d0db218d2593ba39ab..fe2ee2f44bfdaaed22797fcf150a9033bab320e2 100644 (file)
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -17,7 +17,6 @@
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <math.h>
 #include <limits.h>
 

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index cbf8162951b58d30a9346c3cf35623fc7017be52..ff1e1e533cae93bb0391b6a6aeff9d150848a78e 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -12,7 +12,6 @@
 #include "help.h"
 
 #include <signal.h>
-#include <errno.h>
 
 #ifndef WIN32
 #ifdef HAVE_PWD_H

diff --git a/src/bin/psql/mainloop.h b/src/bin/psql/mainloop.h
index 45dd656de8ed6b173c10f24ed9044185f06c5517..6decc523ec5e0c03483cf0be6894f87a3907d642 100644 (file)
--- a/src/bin/psql/mainloop.h
+++ b/src/bin/psql/mainloop.h
@@ -9,7 +9,6 @@
 #define MAINLOOP_H
 
 #include "postgres_fe.h"
-#include <stdio.h>
 
 int                    MainLoop(FILE *source);
 

diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index 94bbe0658f41652fe3d0fa4ef6972934169b7d25..1bbb0f56a6ceb9dbeaba276a65a8bb2fc38a3f89 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -3,8 +3,6 @@
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
 
-#include <stdio.h>
-
 #include "ecpgerrno.h"
 #include "ecpgtype.h"
 #include "ecpglib.h"

diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 723dba08463fd171bcdec6e17f9664f3cd9175fa..066d1f08daedf25cc790977ec6b80134f7b5a034 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -16,7 +16,6 @@
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
 
-#include <stdio.h>
 #include <locale.h>
 
 #include "pg_type.h"

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 043987d6fbde7181a156495b5982b17c67bd22e0..d1ee370f9645d8fe2293ef90cf8fb6ec7f949d54 100644 (file)
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -21,7 +21,6 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <limits.h>
-#include <errno.h>
 
 #include "extern.h"
 

diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index c65a805e6bad591024f11a4e20a1d80eee93f6f6..840407de9e7c7a6151c79fa896abc4da917200e4 100644 (file)
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -30,7 +30,6 @@
 
 #include "postgres_fe.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <time.h>
 

diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c
index 780db0f6e34e5df09f5f0cfd5749bb131779713e..8810080ad227332b74b828a1fb7586202ca04875 100644 (file)
--- a/src/interfaces/libpq/fe-protocol2.c
+++ b/src/interfaces/libpq/fe-protocol2.c
@@ -14,7 +14,6 @@
  */
 #include "postgres_fe.h"
 
-#include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
 

diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index 69c34db482c0213f7ce17e2e51665f7cdacb0c1d..ca8640eab062bdb47e1354e52ac7bf60cbf6022a 100644 (file)
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -24,7 +24,6 @@
 #include "storage/fd.h"
 #include "tzfile.h"
 #include "utils/datetime.h"
-#include "utils/elog.h"
 #include "utils/guc.h"
 #include "utils/hsearch.h"