Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 510ebf7

Browse files
scrappyscrappy
committed
Another first pass at cleaning up the #includes
1 parent d46d533 commit 510ebf7

File tree

16 files changed

+30
-185
lines changed

16 files changed

+30
-185
lines changed

‎src/backend/commands/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for commands
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.1 1996/10/27 09:47:14 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.2 1996/11/03 23:57:17 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,7 +13,6 @@ include ../../Makefile.global
1313

1414
INCLUDE_OPT = -I.. \
1515
-I../port/$(PORTNAME) \
16-
-I../include \
1716
-I../../include
1817

1918
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/commands/_deadcode/version.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.1.1.1 1996/07/09 06:21:23 scrappy Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.2 1996/11/03 23:57:42 scrappy Exp $
1414
*
1515
* NOTES
1616
* At the point the version is defined, 2 physical relations are created
@@ -22,14 +22,12 @@
2222
*-------------------------------------------------------------------------
2323
*/
2424
#include <stdio.h>
25+
#include <string.h>
2526

2627
#include "postgres.h"
2728

28-
#include "utils/rel.h"
2929
#include "access/heapam.h"
3030
#include "utils/builtins.h"
31-
#include "utils/elog.h"
32-
#include "nodes/pg_list.h"
3331
#include "commands/version.h"
3432
#include "access/xact.h" /* for GetCurrentXactStartTime */
3533
#include "tcop/tcopprot.h"

‎src/backend/commands/async.c

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.4 1996/10/21 09:37:20 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.5 1996/11/03 23:57:19 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -61,34 +61,10 @@
6161

6262
#include "postgres.h"
6363

64-
#include "catalog/pg_attribute.h"
65-
#include "access/attnum.h"
66-
#include "nodes/pg_list.h"
67-
#include "access/tupdesc.h"
68-
#include "storage/fd.h"
69-
#include "catalog/pg_am.h"
70-
#include "catalog/pg_class.h"
71-
#include "nodes/nodes.h"
72-
#include "rewrite/prs2lock.h"
73-
#include "access/skey.h"
74-
#include "access/strat.h"
75-
#include "utils/rel.h"
76-
77-
#include "storage/block.h"
78-
#include "storage/off.h"
79-
#include "storage/itemptr.h"
80-
#include <time.h>
81-
#include "utils/nabstime.h"
82-
#include "access/htup.h"
83-
84-
#include "utils/tqual.h"
85-
#include "storage/buf.h"
64+
#include "utils/syscache.h"
8665
#include "access/relscan.h"
87-
8866
#include "access/xact.h"
89-
9067
#include "lib/dllist.h"
91-
9268
#include "utils/palloc.h"
9369

9470
#include "tcop/dest.h"
@@ -98,8 +74,6 @@
9874

9975
#include "access/heapam.h"
10076

101-
#include <stdio.h>
102-
#include "storage/ipc.h"
10377
#include "storage/bufmgr.h"
10478

10579
#include "nodes/memnodes.h"
@@ -112,10 +86,8 @@
11286
#include <errno.h>
11387

11488
#include <netinet/in.h>
115-
#include "libpq/pqcomm.h"
11689
#include "libpq/libpq.h"
11790

118-
#include "utils/syscache.h"
11991

12092
static int notifyFrontEndPending = 0;
12193
static int notifyIssued = 0;

‎src/backend/commands/cluster.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
*
1616
* IDENTIFICATION
17-
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.6 1996/09/26 16:29:05 momjian Exp $
17+
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.7 1996/11/03 23:57:20 scrappy Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
@@ -23,17 +23,11 @@
2323

2424
#include "postgres.h"
2525

26-
#include "nodes/pg_list.h"
27-
28-
#include "access/attnum.h"
2926
#include "access/heapam.h"
3027
#include "access/genam.h"
3128
#include "access/htup.h"
32-
#include "access/itup.h"
33-
#include "access/relscan.h"
3429
#include "access/skey.h"
3530
#include "access/xact.h"
36-
#include "utils/tqual.h"
3731

3832
#include "catalog/catname.h"
3933
#include "utils/syscache.h"
@@ -45,22 +39,17 @@
4539
#include "commands/cluster.h"
4640
#include "commands/rename.h"
4741

48-
#include "storage/buf.h"
4942
#include "storage/bufmgr.h"
50-
#include "storage/itemptr.h"
5143

5244
#include "miscadmin.h"
5345
#include "tcop/dest.h"
5446
#include "commands/command.h"
5547

5648
#include "utils/builtins.h"
5749
#include "utils/excid.h"
58-
#include "utils/elog.h"
5950
#include "utils/mcxt.h"
6051
#include "utils/palloc.h"
61-
#include "utils/rel.h"
6252

63-
#include "catalog/pg_attribute.h"
6453
#include "catalog/pg_proc.h"
6554
#include "catalog/pg_class.h"
6655

‎src/backend/commands/command.c

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.3 1996/10/21 09:37:23 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.4 1996/11/03 23:57:21 scrappy Exp $
1111
*
1212
* NOTES
1313
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -22,32 +22,9 @@
2222
*/
2323
#include "postgres.h"
2424

25-
#include "catalog/pg_attribute.h"
26-
#include "access/attnum.h"
27-
#include "nodes/pg_list.h"
28-
#include "access/tupdesc.h"
29-
#include "storage/fd.h"
30-
#include "catalog/pg_am.h"
31-
#include "catalog/pg_class.h"
32-
#include "nodes/nodes.h"
33-
#include "rewrite/prs2lock.h"
34-
#include "access/skey.h"
35-
#include "access/strat.h"
36-
#include "utils/rel.h"
37-
38-
#include "storage/block.h"
39-
#include "storage/off.h"
40-
#include "storage/itemptr.h"
41-
#include <time.h>
42-
#include "utils/nabstime.h"
43-
#include "access/htup.h"
44-
45-
#include "utils/tqual.h"
46-
#include "storage/buf.h"
4725
#include "access/relscan.h"
4826

4927
#include "nodes/memnodes.h"
50-
#include "nodes/primnodes.h"
5128
#include "nodes/parsenodes.h"
5229
#include "nodes/params.h"
5330
#include "access/sdir.h"
@@ -64,9 +41,6 @@
6441

6542
#include "utils/mcxt.h"
6643

67-
#include <stdio.h>
68-
#include "catalog/pg_index.h"
69-
#include "access/itup.h"
7044
#include "executor/executor.h"
7145

7246
#include "executor/execdefs.h"
@@ -92,7 +66,6 @@
9266

9367
#include "catalog/pg_type.h"
9468

95-
#include "utils/geo-decls.h"
9669
#include "utils/builtins.h"
9770

9871
/* ----------------

‎src/backend/commands/copy.c

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,15 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.11 1996/11/02 02:01:47 bryanh Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.12 1996/11/03 23:57:22 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313

1414
#include <postgres.h>
1515

16-
#include <catalog/pg_attribute.h>
17-
#include <access/attnum.h>
18-
#include <nodes/pg_list.h>
19-
#include <access/tupdesc.h>
20-
#include <storage/fd.h>
21-
#include <catalog/pg_am.h>
22-
#include <catalog/pg_class.h>
23-
#include <nodes/nodes.h>
24-
#include <rewrite/prs2lock.h>
25-
#include <access/skey.h>
26-
#include <access/strat.h>
27-
#include <utils/rel.h>
28-
29-
#include <storage/block.h>
30-
#include <storage/off.h>
31-
#include <storage/itemptr.h>
32-
#include <time.h>
33-
#include <utils/nabstime.h>
34-
#include <access/htup.h>
35-
36-
#include <utils/tqual.h>
37-
#include <storage/buf.h>
38-
#include <access/relscan.h>
3916
#include <access/heapam.h>
4017

41-
#include <access/itup.h>
42-
4318
#include <stdio.h>
4419

4520
#include <tcop/dest.h>
@@ -50,19 +25,15 @@
5025

5126
#include <miscadmin.h>
5227

53-
#include <utils/geo-decls.h>
5428
#include <utils/builtins.h>
5529

5630
#include <sys/stat.h>
5731

58-
#include <access/funcindex.h>
59-
6032
#include <catalog/pg_index.h>
6133

6234
#include <utils/syscache.h>
6335

6436
#include <nodes/params.h>
65-
#include <access/sdir.h>
6637
#include <executor/hashjoin.h>
6738
#include <nodes/primnodes.h>
6839
#include <nodes/memnodes.h>
@@ -71,13 +42,8 @@
7142

7243
#include <utils/memutils.h>
7344

74-
#include <nodes/plannodes.h>
75-
#include <nodes/parsenodes.h>
76-
#include <executor/execdesc.h>
7745
#include <executor/executor.h>
7846

79-
#include <storage/ipc.h>
80-
#include <storage/bufmgr.h>
8147
#include <access/transam.h>
8248

8349
#include <catalog/index.h>
@@ -88,6 +54,7 @@
8854

8955
#include <catalog/catname.h>
9056

57+
#include <catalog/pg_user.h>
9158

9259
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
9360
#define VALUE(c) ((c) - '0')

‎src/backend/commands/creatinh.c

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,13 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.2 1996/10/21 09:37:21 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.3 1996/11/03 23:57:25 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include "postgres.h"
1515

16-
#include "catalog/pg_attribute.h"
17-
#include "access/attnum.h"
18-
#include "nodes/pg_list.h"
19-
#include "access/tupdesc.h"
20-
#include "storage/fd.h"
21-
#include "catalog/pg_am.h"
22-
#include "catalog/pg_class.h"
23-
#include "nodes/nodes.h"
24-
#include "rewrite/prs2lock.h"
25-
#include "access/skey.h"
26-
#include "access/strat.h"
2716
#include "utils/rel.h"
28-
29-
#include "nodes/primnodes.h"
30-
#include <time.h>
31-
#include "utils/nabstime.h"
32-
#include "storage/block.h"
33-
#include "storage/off.h"
34-
#include "storage/itemptr.h"
35-
#include "access/htup.h"
36-
#include "utils/tqual.h"
3717
#include "nodes/parsenodes.h"
3818

3919
#include "catalog/heap.h"
@@ -44,10 +24,6 @@
4424

4525
#include "access/xact.h"
4626

47-
#include "access/htup.h"
48-
#include "utils/tqual.h"
49-
#include "storage/buf.h"
50-
#include "access/relscan.h"
5127
#include "access/heapam.h"
5228

5329
#include "utils/syscache.h"

‎src/backend/commands/defind.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,26 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.5 1996/10/23 07:39:57 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.6 1996/11/03 23:57:27 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14+
#include <string.h>
15+
1416
#include "postgres.h"
1517

1618
#include "access/attnum.h"
1719
#include "access/genam.h"
1820
#include "access/heapam.h"
19-
#include "access/htup.h"
20-
#include "access/funcindex.h"
2121
#include "utils/builtins.h"
2222
#include "utils/syscache.h"
2323
#include "catalog/index.h"
2424
#include "catalog/pg_index.h"
2525
#include "catalog/pg_proc.h"
2626
#include "catalog/pg_opclass.h"
27-
#include "nodes/pg_list.h"
2827
#include "nodes/plannodes.h"
2928
#include "nodes/primnodes.h"
3029
#include "nodes/relation.h"
31-
#include "utils/elog.h"
3230
#include "utils/palloc.h"
3331
#include "utils/relcache.h"
3432
#include "utils/lsyscache.h"

0 commit comments

Comments
 (0)