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

Commit 82b83f6

Browse files
scrappyscrappy
committed
Cosmetic changes to ordering of #include files
1 parent 9a7fda5 commit 82b83f6

File tree

7 files changed

+133
-146
lines changed

7 files changed

+133
-146
lines changed

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

Lines changed: 27 additions & 28 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.8 1996/10/20 22:04:36 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.9 1996/10/21 11:49:35 scrappy Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -17,50 +17,49 @@
1717
*-------------------------------------------------------------------------
1818
*/
1919

20-
#include "postgres.h"
21-
22-
#include "storage/block.h"
23-
#include "storage/off.h"
24-
#include "storage/itemptr.h"
20+
#include <stdio.h>
2521
#include <time.h>
26-
#include "utils/nabstime.h"
27-
#include "access/htup.h"
28-
29-
#include "storage/buf.h"
30-
31-
#include "storage/itemid.h"
32-
#include "storage/item.h"
33-
#include "storage/bufpage.h"
3422

35-
#include "catalog/pg_attribute.h"
23+
#include "postgres.h"
3624
#include "access/attnum.h"
37-
#include "nodes/pg_list.h"
38-
#include "access/tupdesc.h"
39-
#include "storage/fd.h"
25+
#include "access/tupmacs.h"
4026
#include "catalog/pg_am.h"
27+
#include "catalog/pg_attribute.h"
4128
#include "catalog/pg_class.h"
4229
#include "nodes/nodes.h"
43-
#include "rewrite/prs2lock.h"
30+
#include "nodes/pg_list.h"
31+
#include "storage/block.h"
32+
#include "storage/buf.h"
33+
#include "storage/fd.h"
34+
#include "storage/ipc.h"
35+
#include "storage/item.h"
36+
#include "storage/itemid.h"
37+
#include "storage/off.h"
38+
#include "utils/memutils.h"
39+
#include "utils/nabstime.h"
40+
#include "utils/palloc.h"
41+
4442
#include "access/skey.h"
43+
#include "access/tupdesc.h"
44+
#include "rewrite/prs2lock.h"
45+
#include "storage/bufpage.h"
46+
#include "storage/itemptr.h"
47+
4548
#include "access/strat.h"
49+
50+
#include "access/htup.h"
4651
#include "utils/rel.h"
4752

48-
#include "utils/memutils.h"
53+
#include "storage/bufmgr.h"
54+
55+
#include "access/transam.h"
4956

5057
#ifndef HAVE_MEMMOVE
5158
# include "regex/utils.h"
5259
#else
5360
# include <string.h>
5461
#endif
5562

56-
#include "access/tupmacs.h"
57-
58-
#include "utils/palloc.h"
59-
60-
#include <stdio.h>
61-
#include "storage/ipc.h"
62-
#include "storage/bufmgr.h"
63-
#include "access/transam.h"
6463

6564
/* this is so the sparcstation debugger works */
6665

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

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,43 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.5 1996/10/20 22:04:39 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.6 1996/10/21 11:49:36 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include "postgres.h"
16-
17-
#include "storage/block.h"
18-
#include "storage/off.h"
19-
#include "storage/itemptr.h"
2015
#include <time.h>
21-
#include "utils/nabstime.h"
22-
#include "access/htup.h"
2316

17+
#include "postgres.h"
18+
#include "fmgr.h"
2419
#include "access/attnum.h"
25-
#include "access/skey.h"
26-
20+
#include "catalog/pg_am.h"
21+
#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"
2726
#include "storage/buf.h"
28-
27+
#include "storage/fd.h"
28+
#include "storage/item.h"
2929
#include "storage/itemid.h"
30+
#include "storage/off.h"
31+
#include "utils/nabstime.h"
3032

31-
#include "catalog/pg_attribute.h"
32-
#include "access/attnum.h"
33-
#include "nodes/pg_list.h"
33+
#include "access/skey.h"
3434
#include "access/tupdesc.h"
35-
#include "storage/fd.h"
36-
#include "catalog/pg_am.h"
37-
#include "catalog/pg_class.h"
38-
#include "nodes/nodes.h"
35+
#include "access/xact.h"
3936
#include "rewrite/prs2lock.h"
40-
#include "access/strat.h"
41-
#include "utils/rel.h"
42-
43-
#include "storage/item.h"
4437
#include "storage/bufpage.h"
38+
#include "storage/itemptr.h"
4539

46-
#include "utils/tqual.h"
47-
48-
#include "access/xact.h"
40+
#include "access/strat.h"
4941

50-
#include "fmgr.h"
42+
#include "access/htup.h"
43+
#include "utils/rel.h"
5144

5245
#include "access/heaptuple.h"
46+
#include "utils/tqual.h"
5347

5448
/* ----------------
5549
* heap_keytest

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

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

16-
#include "postgres.h"
16+
#include <string.h>
17+
#include <time.h>
1718

18-
#include "storage/block.h"
19-
#include "storage/off.h"
20-
#include "catalog/pg_attribute.h"
19+
#include "postgres.h"
2120
#include "access/attnum.h"
22-
#include "nodes/pg_list.h"
23-
#include "storage/itemptr.h"
24-
#include "access/tupdesc.h"
25-
#include "access/itup.h"
26-
27-
#include "utils/memutils.h"
28-
#include "access/ibit.h"
29-
3021
#include "access/tupmacs.h"
31-
32-
#include <string.h>
33-
34-
#include "utils/palloc.h"
35-
36-
#include <time.h>
37-
#include "storage/fd.h"
3822
#include "catalog/pg_am.h"
23+
#include "catalog/pg_attribute.h"
3924
#include "catalog/pg_class.h"
4025
#include "nodes/nodes.h"
41-
#include "rewrite/prs2lock.h"
26+
#include "nodes/pg_list.h"
27+
#include "storage/block.h"
28+
#include "storage/buf.h"
29+
#include "storage/fd.h"
30+
#include "storage/off.h"
31+
#include "utils/memutils.h"
32+
#include "utils/nabstime.h"
33+
#include "utils/palloc.h"
34+
35+
#include "access/ibit.h"
4236
#include "access/skey.h"
37+
#include "access/tupdesc.h"
38+
#include "rewrite/prs2lock.h"
39+
#include "storage/itemptr.h"
40+
4341
#include "access/strat.h"
44-
#include "utils/rel.h"
45-
#include "utils/nabstime.h"
42+
43+
#include "access/itup.h"
4644
#include "access/htup.h"
47-
#include "storage/itemptr.h"
45+
#include "utils/rel.h"
46+
4847
#include "utils/tqual.h"
49-
#include "storage/buf.h"
48+
5049
#include "access/relscan.h"
50+
5151
#include "access/heapam.h"
5252

5353
static Size IndexInfoFindDataOffset(unsigned short t_info);

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.5 1996/10/20 22:04:43 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.6 1996/10/21 11:49:38 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include "postgres.h"
15+
#include <time.h>
1616

17-
#include "storage/block.h"
18-
#include "storage/off.h"
19-
#include "storage/itemptr.h"
20-
#include "catalog/pg_attribute.h"
17+
#include "postgres.h"
2118
#include "access/attnum.h"
19+
#include "catalog/pg_attribute.h"
20+
#include "executor/execdebug.h"
2221
#include "nodes/pg_list.h"
23-
#include "access/tupdesc.h"
24-
#include "access/itup.h"
22+
#include "storage/off.h"
23+
#include "storage/block.h"
24+
#include "utils/nabstime.h"
2525

2626
#include "access/skey.h"
27+
#include "access/tupdesc.h"
28+
#include "storage/itemptr.h"
2729

28-
#include <time.h>
29-
#include "utils/nabstime.h"
3030
#include "access/htup.h"
31+
#include "access/itup.h"
3132

32-
#include "executor/execdebug.h"
3333

3434
/* ----------------------------------------------------------------
3535
* index scan key qualification code

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

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,50 +8,46 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.5 1996/10/20 22:04:45 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.6 1996/10/21 11:49:39 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

16-
#include "postgres.h"
17-
18-
#include "storage/block.h"
19-
#include "storage/off.h"
20-
#include "storage/itemptr.h"
16+
#include <stdio.h>
17+
#include <sys/types.h>
2118
#include <time.h>
22-
#include "utils/nabstime.h"
23-
#include "access/htup.h"
19+
#include <netinet/in.h>
2420

21+
#include "postgres.h"
22+
#include "fmgr.h"
2523
#include "access/attnum.h"
26-
#include "utils/syscache.h"
27-
28-
#include "catalog/pg_attribute.h"
29-
#include "nodes/pg_list.h"
30-
#include "access/tupdesc.h"
31-
#include "storage/fd.h"
3224
#include "catalog/pg_am.h"
25+
#include "catalog/pg_attribute.h"
3326
#include "catalog/pg_class.h"
27+
#include "libpq/pqcomm.h"
3428
#include "nodes/nodes.h"
35-
#include "rewrite/prs2lock.h"
36-
#include "access/skey.h"
37-
#include "access/strat.h"
38-
#include "utils/rel.h"
39-
#include "catalog/pg_type.h"
40-
29+
#include "nodes/pg_list.h"
30+
#include "storage/block.h"
4131
#include "storage/buf.h"
32+
#include "storage/fd.h"
33+
#include "storage/off.h"
34+
#include "utils/nabstime.h"
35+
#include "utils/palloc.h"
4236

43-
#include "access/heaptuple.h" /* Prototypes */
44-
#include "fmgr.h" /* Prototypes */
45-
46-
#include <stdio.h>
47-
#include <sys/types.h>
48-
#include <netinet/in.h>
49-
#include "libpq/pqcomm.h"
5037
#include "libpq/libpq.h"
38+
#include "storage/itemptr.h"
39+
#include "access/tupdesc.h"
40+
#include "rewrite/prs2lock.h"
41+
#include "access/skey.h"
5142

52-
#include <stdio.h>
43+
#include "access/strat.h"
5344

54-
#include "utils/palloc.h"
45+
#include "access/htup.h"
46+
#include "utils/rel.h"
47+
48+
#include "catalog/pg_type.h"
49+
#include "utils/syscache.h"
50+
#include "access/heaptuple.h"
5551

5652
/* ----------------------------------------------------------------
5753
* printtup / debugtup support

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.4 1996/10/20 22:04:47 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.5 1996/10/21 11:49:40 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

1515
#include "postgres.h"
1616

17+
#include "fmgr.h"
1718
#include "access/attnum.h"
19+
1820
#include "access/skey.h"
1921

20-
#include "fmgr.h"
2122

2223
/*
2324
* ScanKeyEntryIsLegal --

0 commit comments

Comments
 (0)