diff options
author | Tom Lane | 2005-05-06 17:24:55 +0000 |
---|---|---|
committer | Tom Lane | 2005-05-06 17:24:55 +0000 |
commit | e9739046c2cccb7e8db65fc48bae13093a16e71a (patch) | |
tree | e905d770c5e5883f5382b915eadccec2c5c5af76 | |
parent | 13fb19935976c6107339cfd268b695418be18aac (diff) |
For some reason access/tupmacs.h has been #including utils/memutils.h,
which is neither needed by nor related to that header. Remove the bogus
inclusion and instead include the header in those C files that actually
need it. Also fix unnecessary inclusions and bad inclusion order in
tsearch2 files.
44 files changed, 58 insertions, 49 deletions
diff --git a/contrib/tsearch2/dict.c b/contrib/tsearch2/dict.c index 0b7fb7288c..de81846e37 100644 --- a/contrib/tsearch2/dict.c +++ b/contrib/tsearch2/dict.c @@ -2,16 +2,15 @@ * interface functions to dictionary * Teodor Sigaev <[email protected]> */ -#include <errno.h> -#include <stdlib.h> -#include <string.h> +#include "postgres.h" + #include <ctype.h> -#include "postgres.h" -#include "fmgr.h" -#include "utils/array.h" #include "catalog/pg_type.h" #include "executor/spi.h" +#include "fmgr.h" +#include "utils/array.h" +#include "utils/memutils.h" #include "dict.h" #include "common.h" diff --git a/contrib/tsearch2/dict_ex.c b/contrib/tsearch2/dict_ex.c index 241161a5c2..cee2d1e976 100644 --- a/contrib/tsearch2/dict_ex.c +++ b/contrib/tsearch2/dict_ex.c @@ -2,10 +2,6 @@ * example of dictionary * Teodor Sigaev <[email protected]> */ -#include <errno.h> -#include <stdlib.h> -#include <string.h> - #include "postgres.h" #include "dict.h" diff --git a/contrib/tsearch2/dict_ispell.c b/contrib/tsearch2/dict_ispell.c index 9af11edf8e..12d9205a4e 100644 --- a/contrib/tsearch2/dict_ispell.c +++ b/contrib/tsearch2/dict_ispell.c @@ -2,12 +2,10 @@ * ISpell interface * Teodor Sigaev <[email protected]> */ -#include <stdlib.h> -#include <string.h> -#include <ctype.h> - #include "postgres.h" +#include <ctype.h> + #include "dict.h" #include "common.h" #include "ispell/spell.h" diff --git a/contrib/tsearch2/dict_snowball.c b/contrib/tsearch2/dict_snowball.c index 03850b33ea..a43b49c2c5 100644 --- a/contrib/tsearch2/dict_snowball.c +++ b/contrib/tsearch2/dict_snowball.c @@ -3,9 +3,6 @@ * http://snowball.tartarus.org/ * Teodor Sigaev <[email protected]> */ -#include <stdlib.h> -#include <string.h> - #include "postgres.h" #include "dict.h" diff --git a/contrib/tsearch2/dict_syn.c b/contrib/tsearch2/dict_syn.c index 6e3ed86434..d3e884212b 100644 --- a/contrib/tsearch2/dict_syn.c +++ b/contrib/tsearch2/dict_syn.c @@ -2,13 +2,10 @@ * ISpell interface * Teodor Sigaev <[email protected]> */ -#include <stdlib.h> -#include <string.h> -#include <ctype.h> -#include <errno.h> - #include "postgres.h" +#include <ctype.h> + #include "dict.h" #include "common.h" diff --git a/contrib/tsearch2/prs_dcfg.c b/contrib/tsearch2/prs_dcfg.c index 0837451f22..af83b6506d 100644 --- a/contrib/tsearch2/prs_dcfg.c +++ b/contrib/tsearch2/prs_dcfg.c @@ -2,12 +2,10 @@ * Simple config parser * Teodor Sigaev <[email protected]> */ -#include <stdlib.h> -#include <string.h> -#include <ctype.h> - #include "postgres.h" +#include <ctype.h> + #include "dict.h" #include "common.h" diff --git a/contrib/tsearch2/snmap.c b/contrib/tsearch2/snmap.c index c152b1ac23..9aa0e2214f 100644 --- a/contrib/tsearch2/snmap.c +++ b/contrib/tsearch2/snmap.c @@ -2,11 +2,8 @@ * simple but fast map from str to Oid * Teodor Sigaev <[email protected]> */ -#include <errno.h> -#include <stdlib.h> -#include <string.h> - #include "postgres.h" + #include "snmap.h" #include "common.h" diff --git a/contrib/tsearch2/ts_cfg.c b/contrib/tsearch2/ts_cfg.c index 735d406109..c5916b0f0d 100644 --- a/contrib/tsearch2/ts_cfg.c +++ b/contrib/tsearch2/ts_cfg.c @@ -2,17 +2,16 @@ * interface functions to tscfg * Teodor Sigaev <[email protected]> */ -#include <errno.h> -#include <stdlib.h> -#include <string.h> +#include "postgres.h" + #include <ctype.h> #include <locale.h> -#include "postgres.h" -#include "fmgr.h" -#include "utils/array.h" #include "catalog/pg_type.h" #include "executor/spi.h" +#include "fmgr.h" +#include "utils/array.h" +#include "utils/memutils.h" #include "ts_cfg.h" #include "dict.h" diff --git a/contrib/tsearch2/wparser.c b/contrib/tsearch2/wparser.c index 33bfd4d87e..39cd673bb0 100644 --- a/contrib/tsearch2/wparser.c +++ b/contrib/tsearch2/wparser.c @@ -2,17 +2,16 @@ * interface functions to parser * Teodor Sigaev <[email protected]> */ -#include <errno.h> -#include <stdlib.h> -#include <string.h> +#include "postgres.h" + #include <ctype.h> -#include "postgres.h" -#include "fmgr.h" -#include "utils/array.h" #include "catalog/pg_type.h" #include "executor/spi.h" +#include "fmgr.h" #include "funcapi.h" +#include "utils/array.h" +#include "utils/memutils.h" #include "wparser.h" #include "ts_cfg.h" diff --git a/contrib/tsearch2/wparser_def.c b/contrib/tsearch2/wparser_def.c index 93368b1e89..a33bacf31b 100644 --- a/contrib/tsearch2/wparser_def.c +++ b/contrib/tsearch2/wparser_def.c @@ -2,11 +2,8 @@ * default word parser * Teodor Sigaev <[email protected]> */ -#include <errno.h> -#include <stdlib.h> -#include <string.h> - #include "postgres.h" + #include "utils/builtins.h" #include "dict.h" diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 2c9cf5c4ba..483a476c53 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -26,6 +26,7 @@ #include "miscadmin.h" #include "storage/freespace.h" #include "storage/smgr.h" +#include "utils/memutils.h" /* Working state for btbuild and its callback */ diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 9b0c650222..e4d590c30b 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -43,6 +43,7 @@ #include "utils/fmgroids.h" #include "utils/guc.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/ps_status.h" #include "utils/relcache.h" diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 93300a5fcb..a42cdfff6e 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -44,6 +44,7 @@ #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/relcache.h" #include "utils/syscache.h" diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 48c7c40eea..92dac90dff 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -34,6 +34,7 @@ #include "utils/datum.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/syscache.h" #include "utils/tuplesort.h" diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index 30506b0e08..ee54de2ae8 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -75,7 +75,6 @@ #include <unistd.h> #include <signal.h> -#include <errno.h> #include <netinet/in.h> #include "access/heapam.h" @@ -88,6 +87,7 @@ #include "storage/sinval.h" #include "tcop/tcopprot.h" #include "utils/fmgroids.h" +#include "utils/memutils.h" #include "utils/ps_status.h" #include "utils/syscache.h" diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 0858a3c567..9979afaab8 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -32,6 +32,7 @@ #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/syscache.h" #include "utils/relcache.h" diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 5d4a238e5c..fca509de95 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -43,8 +43,9 @@ #include "tcop/tcopprot.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "utils/relcache.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" +#include "utils/relcache.h" #include "utils/syscache.h" diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 6b015bfcd0..d36313276c 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -40,6 +40,7 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/relcache.h" #include "utils/syscache.h" diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 620861fffb..8ea8b25428 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -58,6 +58,7 @@ #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/relcache.h" #include "utils/syscache.h" diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index cfb03b7894..734d5c0580 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -36,6 +36,7 @@ #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/syscache.h" diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index fa5470cfd5..929335ca01 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -59,6 +59,7 @@ #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/syscache.h" diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 3502b985ad..f02e7dfcd8 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -44,6 +44,7 @@ #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/relcache.h" #include "utils/syscache.h" #include "pgstat.h" diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 2e4da3bb90..6d0129f7ea 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -47,6 +47,7 @@ #include "utils/acl.h" #include "utils/guc.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" typedef struct execRowMark diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 34de0a41c3..ee217df7ea 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -51,6 +51,7 @@ #include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/typcache.h" diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 666c6c18bd..40398713d0 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -83,6 +83,7 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/syscache.h" #include "utils/tuplesort.h" #include "utils/datum.h" diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index a2c74b782c..51182c6736 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -39,6 +39,7 @@ #include "executor/execdebug.h" #include "executor/nodeBitmapHeapscan.h" #include "parser/parsetree.h" +#include "utils/memutils.h" static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node); diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c index fc8b615dc1..11bea2a783 100644 --- a/src/backend/executor/nodeBitmapIndexscan.c +++ b/src/backend/executor/nodeBitmapIndexscan.c @@ -27,6 +27,7 @@ #include "executor/nodeBitmapIndexscan.h" #include "executor/nodeIndexscan.h" #include "miscadmin.h" +#include "utils/memutils.h" /* ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 110879be59..2587a9b42c 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -32,6 +32,7 @@ #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" #include "parser/parsetree.h" +#include "utils/memutils.h" static TupleTableSlot *IndexNext(IndexScanState *node); diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index b736688802..311e25238a 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -73,6 +73,7 @@ #include "executor/execdefs.h" #include "executor/nodeMergejoin.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/syscache.h" diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c index a0daf963e7..e5b8daa1f5 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -37,6 +37,7 @@ #include "access/heapam.h" #include "executor/executor.h" #include "executor/nodeSetOp.h" +#include "utils/memutils.h" /* ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index 0f4c588072..b06b2b26b1 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -27,6 +27,7 @@ #include "utils/array.h" #include "utils/datum.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" static Datum ExecHashSubPlan(SubPlanState *node, diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c index f32f5e6c52..4c34478b11 100644 --- a/src/backend/executor/nodeUnique.c +++ b/src/backend/executor/nodeUnique.c @@ -28,6 +28,7 @@ #include "access/heapam.h" #include "executor/executor.h" #include "executor/nodeUnique.h" +#include "utils/memutils.h" /* ---------------------------------------------------------------- diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index 18ee4cdce7..fba5f6fa2c 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -20,6 +20,7 @@ #include "executor/spi_priv.h" #include "tcop/tcopprot.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/typcache.h" diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 952d70947a..3e4b2e5f2f 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -37,6 +37,7 @@ #include "utils/builtins.h" #include "utils/catcache.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/pg_locale.h" #include "utils/selfuncs.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index ac96f6b471..b0308e181e 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -29,6 +29,7 @@ #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/catcache.h" +#include "utils/memutils.h" #include "utils/relcache.h" #include "utils/resowner.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index a4f1f1f786..41fb1e1fb7 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -58,6 +58,7 @@ #include "utils/fmgroids.h" #include "utils/inval.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/relcache.h" #include "utils/resowner.h" #include "utils/syscache.h" diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index d1121e5c29..47515e6d0d 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -94,6 +94,7 @@ #include "utils/datum.h" #include "utils/logtape.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/syscache.h" #include "utils/tuplesort.h" diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c index e1de7bd557..c6b66c1b0f 100644 --- a/src/backend/utils/sort/tuplestore.c +++ b/src/backend/utils/sort/tuplestore.c @@ -45,8 +45,10 @@ #include "access/heapam.h" #include "storage/buffile.h" +#include "utils/memutils.h" #include "utils/tuplestore.h" + /* * Possible states of a Tuplestore object. These denote the states that * persist between calls of Tuplestore routines. diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index 6208366d7a..a11072fb27 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -14,7 +14,6 @@ #ifndef TUPMACS_H #define TUPMACS_H -#include "utils/memutils.h" /* * check to see if the ATT'th bit of an array of 8-bit bytes is set. diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 3b7b4ca3a5..1031214992 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -51,6 +51,7 @@ #include "executor/spi.h" #include "funcapi.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/typcache.h" /* perl stuff */ diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index c155e4d5eb..2ec43ba40f 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -56,6 +56,7 @@ #include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/syscache.h" diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index 7ceaa2cba1..780f1d2af6 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -51,6 +51,7 @@ #include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/typcache.h" diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 6bc25ccce6..7723f7e45e 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -52,6 +52,7 @@ #include "parser/parse_type.h" #include "tcop/tcopprot.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index 28d7804c2d..5a5ba21659 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -58,6 +58,7 @@ #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/syscache.h" #include "utils/typcache.h" |