Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit278bd0c

Browse files
committed
For some reason access/tupmacs.h has been #including utils/memutils.h,
which is neither needed by nor related to that header. Remove the bogusinclusion and instead include the header in those C files that actuallyneed it. Also fix unnecessary inclusions and bad inclusion order intsearch2 files.
1 parent4eec2f2 commit278bd0c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+92
-83
lines changed

‎contrib/tsearch2/dict.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22
* interface functions to dictionary
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include<errno.h>
6-
#include<stdlib.h>
7-
#include<string.h>
5+
#include"postgres.h"
6+
87
#include<ctype.h>
98

10-
#include"postgres.h"
11-
#include"fmgr.h"
12-
#include"utils/array.h"
139
#include"catalog/pg_type.h"
1410
#include"executor/spi.h"
11+
#include"fmgr.h"
12+
#include"utils/array.h"
13+
#include"utils/memutils.h"
1514

1615
#include"dict.h"
1716
#include"common.h"

‎contrib/tsearch2/dict_ex.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
* example of dictionary
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include<errno.h>
6-
#include<stdlib.h>
7-
#include<string.h>
8-
95
#include"postgres.h"
106

117
#include"dict.h"

‎contrib/tsearch2/dict_ispell.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
* ISpell interface
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include<stdlib.h>
6-
#include<string.h>
7-
#include<ctype.h>
8-
95
#include"postgres.h"
106

7+
#include<ctype.h>
8+
119
#include"dict.h"
1210
#include"common.h"
1311
#include"ispell/spell.h"

‎contrib/tsearch2/dict_snowball.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
* http://snowball.tartarus.org/
44
* Teodor Sigaev <teodor@sigaev.ru>
55
*/
6-
#include<stdlib.h>
7-
#include<string.h>
8-
96
#include"postgres.h"
107

118
#include"dict.h"

‎contrib/tsearch2/dict_syn.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22
* ISpell interface
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include<stdlib.h>
6-
#include<string.h>
7-
#include<ctype.h>
8-
#include<errno.h>
9-
105
#include"postgres.h"
116

7+
#include<ctype.h>
8+
129
#include"dict.h"
1310
#include"common.h"
1411

‎contrib/tsearch2/prs_dcfg.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
* Simple config parser
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include<stdlib.h>
6-
#include<string.h>
7-
#include<ctype.h>
8-
95
#include"postgres.h"
106

7+
#include<ctype.h>
8+
119
#include"dict.h"
1210
#include"common.h"
1311

‎contrib/tsearch2/snmap.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
* simple but fast map from str to Oid
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include<errno.h>
6-
#include<stdlib.h>
7-
#include<string.h>
8-
95
#include"postgres.h"
6+
107
#include"snmap.h"
118
#include"common.h"
129

‎contrib/tsearch2/ts_cfg.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
* interface functions to tscfg
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include<errno.h>
6-
#include<stdlib.h>
7-
#include<string.h>
5+
#include"postgres.h"
6+
87
#include<ctype.h>
98
#include<locale.h>
109

11-
#include"postgres.h"
12-
#include"fmgr.h"
13-
#include"utils/array.h"
1410
#include"catalog/pg_type.h"
1511
#include"executor/spi.h"
12+
#include"fmgr.h"
13+
#include"utils/array.h"
14+
#include"utils/memutils.h"
1615

1716
#include"ts_cfg.h"
1817
#include"dict.h"

‎contrib/tsearch2/wparser.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
* interface functions to parser
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include<errno.h>
6-
#include<stdlib.h>
7-
#include<string.h>
5+
#include"postgres.h"
6+
87
#include<ctype.h>
98

10-
#include"postgres.h"
11-
#include"fmgr.h"
12-
#include"utils/array.h"
139
#include"catalog/pg_type.h"
1410
#include"executor/spi.h"
11+
#include"fmgr.h"
1512
#include"funcapi.h"
13+
#include"utils/array.h"
14+
#include"utils/memutils.h"
1615

1716
#include"wparser.h"
1817
#include"ts_cfg.h"

‎contrib/tsearch2/wparser_def.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
* default word parser
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include<errno.h>
6-
#include<stdlib.h>
7-
#include<string.h>
8-
95
#include"postgres.h"
6+
107
#include"utils/builtins.h"
118

129
#include"dict.h"

‎src/backend/access/nbtree/nbtree.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Portions Copyright (c) 1994, Regents of the University of California
1313
*
1414
* IDENTIFICATION
15-
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.127 2005/03/27 23:53:00 tgl Exp $
15+
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.128 2005/05/06 17:24:52 tgl Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -26,6 +26,7 @@
2626
#include"miscadmin.h"
2727
#include"storage/freespace.h"
2828
#include"storage/smgr.h"
29+
#include"utils/memutils.h"
2930

3031

3132
/* Working state for btbuild and its callback */

‎src/backend/bootstrap/bootstrap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.203 2005/05/01 18:56:17 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.204 2005/05/06 17:24:52 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -43,6 +43,7 @@
4343
#include"utils/fmgroids.h"
4444
#include"utils/guc.h"
4545
#include"utils/lsyscache.h"
46+
#include"utils/memutils.h"
4647
#include"utils/ps_status.h"
4748
#include"utils/relcache.h"
4849

‎src/backend/catalog/index.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.253 2005/04/28 21:47:11 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.254 2005/05/06 17:24:52 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -44,6 +44,7 @@
4444
#include"utils/fmgroids.h"
4545
#include"utils/inval.h"
4646
#include"utils/lsyscache.h"
47+
#include"utils/memutils.h"
4748
#include"utils/relcache.h"
4849
#include"utils/syscache.h"
4950

‎src/backend/commands/analyze.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.85 2005/04/14 20:03:23 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.86 2005/05/06 17:24:53 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -34,6 +34,7 @@
3434
#include"utils/datum.h"
3535
#include"utils/fmgroids.h"
3636
#include"utils/lsyscache.h"
37+
#include"utils/memutils.h"
3738
#include"utils/syscache.h"
3839
#include"utils/tuplesort.h"
3940

‎src/backend/commands/async.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.121 2005/04/14 20:03:23 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.122 2005/05/06 17:24:53 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -75,7 +75,6 @@
7575

7676
#include<unistd.h>
7777
#include<signal.h>
78-
#include<errno.h>
7978
#include<netinet/in.h>
8079

8180
#include"access/heapam.h"
@@ -88,6 +87,7 @@
8887
#include"storage/sinval.h"
8988
#include"tcop/tcopprot.h"
9089
#include"utils/fmgroids.h"
90+
#include"utils/memutils.h"
9191
#include"utils/ps_status.h"
9292
#include"utils/syscache.h"
9393

‎src/backend/commands/cluster.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.136 2005/04/14 20:03:23 tgl Exp $
14+
* $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.137 2005/05/06 17:24:53 tgl Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -32,6 +32,7 @@
3232
#include"utils/fmgroids.h"
3333
#include"utils/inval.h"
3434
#include"utils/lsyscache.h"
35+
#include"utils/memutils.h"
3536
#include"utils/syscache.h"
3637
#include"utils/relcache.h"
3738

‎src/backend/commands/copy.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.242 2005/05/0602:56:42 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.243 2005/05/0617:24:53 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -43,8 +43,9 @@
4343
#include"tcop/tcopprot.h"
4444
#include"utils/acl.h"
4545
#include"utils/builtins.h"
46-
#include"utils/relcache.h"
4746
#include"utils/lsyscache.h"
47+
#include"utils/memutils.h"
48+
#include"utils/relcache.h"
4849
#include"utils/syscache.h"
4950

5051

‎src/backend/commands/indexcmds.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.130 2005/04/14 20:03:23 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.131 2005/05/06 17:24:53 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -40,6 +40,7 @@
4040
#include"utils/acl.h"
4141
#include"utils/builtins.h"
4242
#include"utils/lsyscache.h"
43+
#include"utils/memutils.h"
4344
#include"utils/relcache.h"
4445
#include"utils/syscache.h"
4546

‎src/backend/commands/tablecmds.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.155 2005/04/14 20:03:24 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.156 2005/05/06 17:24:53 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -58,6 +58,7 @@
5858
#include"utils/fmgroids.h"
5959
#include"utils/inval.h"
6060
#include"utils/lsyscache.h"
61+
#include"utils/memutils.h"
6162
#include"utils/relcache.h"
6263
#include"utils/syscache.h"
6364

‎src/backend/commands/trigger.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.187 2005/04/28 21:47:11 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.188 2005/05/06 17:24:53 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -36,6 +36,7 @@
3636
#include"utils/fmgroids.h"
3737
#include"utils/inval.h"
3838
#include"utils/lsyscache.h"
39+
#include"utils/memutils.h"
3940
#include"utils/syscache.h"
4041

4142

‎src/backend/commands/typecmds.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.71 2005/05/01 18:56:18 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.72 2005/05/06 17:24:53 tgl Exp $
1212
*
1313
* DESCRIPTION
1414
* The "DefineFoo" routines take the parse tree and pick out the
@@ -59,6 +59,7 @@
5959
#include"utils/builtins.h"
6060
#include"utils/fmgroids.h"
6161
#include"utils/lsyscache.h"
62+
#include"utils/memutils.h"
6263
#include"utils/syscache.h"
6364

6465

‎src/backend/commands/vacuum.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.307 2005/04/28 21:47:12 tgl Exp $
16+
* $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.308 2005/05/06 17:24:53 tgl Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -44,6 +44,7 @@
4444
#include"utils/fmgroids.h"
4545
#include"utils/inval.h"
4646
#include"utils/lsyscache.h"
47+
#include"utils/memutils.h"
4748
#include"utils/relcache.h"
4849
#include"utils/syscache.h"
4950
#include"pgstat.h"

‎src/backend/executor/execMain.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
*
2828
* IDENTIFICATION
29-
* $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.247 2005/04/28 21:47:12 tgl Exp $
29+
* $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.248 2005/05/06 17:24:53 tgl Exp $
3030
*
3131
*-------------------------------------------------------------------------
3232
*/
@@ -47,6 +47,7 @@
4747
#include"utils/acl.h"
4848
#include"utils/guc.h"
4949
#include"utils/lsyscache.h"
50+
#include"utils/memutils.h"
5051

5152

5253
typedefstructexecRowMark

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp