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

Commita956742

Browse files
committed
More intelligent #include cleanups, as pointed out by Bryan...
Compiled with -Wall -Werror
1 parent3516eda commita956742

File tree

8 files changed

+36
-103
lines changed

8 files changed

+36
-103
lines changed

‎src/backend/access/common/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/common
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.3 1996/10/31 07:22:07 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.4 1996/11/01 09:41:33 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -14,7 +14,7 @@ include ../../../Makefile.global
1414
INCLUDE_OPT = -I../../port/$(PORTNAME)\
1515
-I../../../include
1616

17-
CFLAGS+=$(INCLUDE_OPT)
17+
CFLAGS+=$(INCLUDE_OPT) -Wall -Werror
1818

1919
OBJS = heaptuple.o heapvalid.o indextuple.o indexvalid.o printtup.o\
2020
scankey.o tupdesc.o

‎src/backend/access/common/heaptuple.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.11 1996/11/01 09:12:18 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.12 1996/11/01 09:41:35 scrappy Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -19,14 +19,14 @@
1919

2020
#include"postgres.h"
2121

22-
#include"utils/palloc.h"
23-
#include"storage/bufpage.h"
22+
#include"access/htup.h"
2423
#include"access/transam.h"
25-
#include"storage/buf.h"
26-
#include"access/tupmacs.h"
2724
#include"access/tupdesc.h"
25+
#include"access/tupmacs.h"
26+
#include"storage/buf.h"
27+
#include"storage/bufpage.h"
2828
#include"utils/memutils.h"
29-
#include"access/htup.h"
29+
#include"utils/palloc.h"
3030

3131
#ifndefHAVE_MEMMOVE
3232
# include"regex/utils.h"

‎src/backend/access/common/heapvalid.c

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,26 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.8 1996/10/31 07:48:36 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.9 1996/11/01 09:41:37 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include<time.h>
16-
1715
#include"postgres.h"
16+
17+
#include"access/htup.h"
18+
#include"utils/rel.h"
19+
#include"access/tupdesc.h"
20+
1821
#include"fmgr.h"
19-
#include"access/attnum.h"
20-
#include"catalog/pg_am.h"
2122
#include"catalog/pg_attribute.h"
22-
#include"catalog/pg_class.h"
23-
#include"nodes/nodes.h"
24-
#include"nodes/pg_list.h"
25-
#include"storage/block.h"
2623
#include"storage/buf.h"
27-
#include"storage/fd.h"
2824
#include"storage/item.h"
2925
#include"storage/itemid.h"
30-
#include"storage/off.h"
3126
#include"storage/page.h"
32-
#include"utils/nabstime.h"
3327

34-
#include"access/skey.h"
35-
#include"access/tupdesc.h"
3628
#include"access/xact.h"
37-
#include"rewrite/prs2lock.h"
3829
#include"storage/bufpage.h"
39-
#include"storage/itemptr.h"
40-
41-
#include"access/strat.h"
42-
43-
#include"access/htup.h"
44-
#include"utils/rel.h"
4530

4631
#include"access/heaptuple.h"
4732
#include"utils/tqual.h"

‎src/backend/access/common/indextuple.c

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,27 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.7 1996/10/21 11:49:37 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.8 1996/11/01 09:41:37 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

1616
#include<string.h>
17-
#include<time.h>
1817

1918
#include"postgres.h"
20-
#include"access/attnum.h"
19+
#include"access/htup.h"
20+
#include"utils/rel.h"
21+
2122
#include"access/tupmacs.h"
22-
#include"catalog/pg_am.h"
2323
#include"catalog/pg_attribute.h"
24-
#include"catalog/pg_class.h"
25-
#include"nodes/nodes.h"
26-
#include"nodes/pg_list.h"
27-
#include"storage/block.h"
2824
#include"storage/buf.h"
29-
#include"storage/fd.h"
30-
#include"storage/off.h"
3125
#include"utils/memutils.h"
32-
#include"utils/nabstime.h"
3326
#include"utils/palloc.h"
3427

3528
#include"access/ibit.h"
36-
#include"access/skey.h"
3729
#include"access/tupdesc.h"
38-
#include"rewrite/prs2lock.h"
39-
#include"storage/itemptr.h"
40-
41-
#include"access/strat.h"
4230

4331
#include"access/itup.h"
44-
#include"access/htup.h"
45-
#include"utils/rel.h"
4632

4733
#include"utils/tqual.h"
4834

‎src/backend/access/common/indexvalid.c

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,20 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.8 1996/10/31 07:48:37 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.9 1996/11/01 09:41:38 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include<time.h>
16-
1715
#include"postgres.h"
18-
#include"access/attnum.h"
19-
#include"catalog/pg_attribute.h"
16+
17+
#include"access/htup.h"
18+
#include"access/tupdesc.h"
19+
2020
#include"executor/execdebug.h"
21-
#include"nodes/nodes.h"
22-
#include"nodes/pg_list.h"
23-
#include"storage/off.h"
24-
#include"storage/block.h"
25-
#include"utils/nabstime.h"
2621

2722
#include"access/skey.h"
28-
#include"access/tupdesc.h"
29-
#include"storage/itemptr.h"
3023

31-
#include"access/htup.h"
3224
#include"access/itup.h"
3325

3426

‎src/backend/access/common/printtup.c

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,27 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.6 1996/10/21 11:49:39 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.7 1996/11/01 09:41:39 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

1616
#include<stdio.h>
1717
#include<sys/types.h>
18-
#include<time.h>
1918
#include<netinet/in.h>
2019

2120
#include"postgres.h"
21+
22+
#include"access/htup.h"
23+
#include"utils/rel.h"
24+
#include"access/tupdesc.h"
25+
2226
#include"fmgr.h"
23-
#include"access/attnum.h"
24-
#include"catalog/pg_am.h"
25-
#include"catalog/pg_attribute.h"
26-
#include"catalog/pg_class.h"
2727
#include"libpq/pqcomm.h"
28-
#include"nodes/nodes.h"
29-
#include"nodes/pg_list.h"
30-
#include"storage/block.h"
3128
#include"storage/buf.h"
32-
#include"storage/fd.h"
33-
#include"storage/off.h"
34-
#include"utils/nabstime.h"
3529
#include"utils/palloc.h"
3630

3731
#include"libpq/libpq.h"
38-
#include"storage/itemptr.h"
39-
#include"access/tupdesc.h"
40-
#include"rewrite/prs2lock.h"
41-
#include"access/skey.h"
42-
43-
#include"access/strat.h"
44-
45-
#include"access/htup.h"
46-
#include"utils/rel.h"
4732

4833
#include"catalog/pg_type.h"
4934
#include"utils/syscache.h"

‎src/backend/access/common/scankey.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.5 1996/10/21 11:49:40 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.6 1996/11/01 09:41:40 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -19,7 +19,6 @@
1919

2020
#include"access/skey.h"
2121

22-
2322
/*
2423
* ScanKeyEntryIsLegal --
2524
*True iff the scan key entry is legal.

‎src/backend/access/common/tupdesc.c

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.6 1996/10/31 07:48:38 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.7 1996/11/01 09:41:41 scrappy Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -21,30 +21,16 @@
2121
#include<time.h>
2222

2323
#include"postgres.h"
24+
25+
#include"access/htup.h"
26+
#include"utils/rel.h"
27+
#include"access/tupdesc.h"
28+
2429
#include"utils/fcache.h"
25-
#include"access/attnum.h"
26-
#include"catalog/pg_am.h"
27-
#include"catalog/pg_attribute.h"
28-
#include"catalog/pg_class.h"
29-
#include"nodes/nodes.h"
30-
#include"nodes/pg_list.h"
31-
#include"storage/block.h"
32-
#include"storage/fd.h"
33-
#include"storage/off.h"
3430
#include"utils/geo-decls.h"
35-
#include"utils/nabstime.h"
3631
#include"utils/palloc.h"
3732

3833
#include"nodes/primnodes.h"
39-
#include"access/tupdesc.h"
40-
#include"rewrite/prs2lock.h"
41-
#include"storage/itemptr.h"
42-
#include"access/skey.h"
43-
44-
#include"access/strat.h"
45-
46-
#include"access/htup.h"
47-
#include"utils/rel.h"
4834

4935
#include"catalog/pg_type.h"
5036
#include"utils/builtins.h"

0 commit comments

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