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

Commitdddf4cd

Browse files
author
Amit Kapila
committed
Make the order of the header file includes consistent in non-backend modules.
Similar to commit7e73503, this commit makes the order of header fileinclusion consistent for non-backend modules.In passing, fix the case where we were using angle brackets (<>) for thelocal module includes instead of quotes ("").Author: Vignesh CReviewed-by: Amit KapilaDiscussion:https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
1 parent8270a0d commitdddf4cd

File tree

102 files changed

+237
-345
lines changed

Some content is hidden

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

102 files changed

+237
-345
lines changed

‎src/bin/pg_archivecleanup/pg_archivecleanup.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
#include<signal.h>
1616
#include<sys/time.h>
1717

18-
#include"pg_getopt.h"
19-
20-
#include"common/logging.h"
21-
2218
#include"access/xlog_internal.h"
19+
#include"common/logging.h"
20+
#include"pg_getopt.h"
2321

2422
constchar*progname;
2523

‎src/bin/pg_basebackup/pg_basebackup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
#include"fe_utils/string_utils.h"
3636
#include"getopt_long.h"
3737
#include"libpq-fe.h"
38-
#include"pqexpbuffer.h"
3938
#include"pgtar.h"
4039
#include"pgtime.h"
40+
#include"pqexpbuffer.h"
4141
#include"receivelog.h"
4242
#include"replication/basebackup.h"
4343
#include"streamutil.h"

‎src/bin/pg_basebackup/pg_receivewal.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,14 @@
1919
#include<sys/stat.h>
2020
#include<unistd.h>
2121

22+
#include"access/xlog_internal.h"
2223
#include"common/file_perm.h"
2324
#include"common/logging.h"
24-
#include"libpq-fe.h"
25-
#include"access/xlog_internal.h"
2625
#include"getopt_long.h"
27-
26+
#include"libpq-fe.h"
2827
#include"receivelog.h"
2928
#include"streamutil.h"
3029

31-
3230
/* Time to sleep between reconnection attempts */
3331
#defineRECONNECT_SLEEP_TIME 5
3432

‎src/bin/pg_basebackup/pg_recvlogical.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,15 @@
1919
#include<sys/select.h>
2020
#endif
2121

22-
/* local includes */
23-
#include"streamutil.h"
24-
2522
#include"access/xlog_internal.h"
26-
#include"common/file_perm.h"
2723
#include"common/fe_memutils.h"
24+
#include"common/file_perm.h"
2825
#include"common/logging.h"
2926
#include"getopt_long.h"
3027
#include"libpq-fe.h"
3128
#include"libpq/pqsignal.h"
3229
#include"pqexpbuffer.h"
33-
30+
#include"streamutil.h"
3431

3532
/* Time to sleep between reconnection attempts */
3633
#defineRECONNECT_SLEEP_TIME 5

‎src/bin/pg_basebackup/receivelog.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@
2020
#include<sys/select.h>
2121
#endif
2222

23-
/* local includes */
24-
#include"receivelog.h"
25-
#include"streamutil.h"
26-
27-
#include"libpq-fe.h"
2823
#include"access/xlog_internal.h"
2924
#include"common/file_utils.h"
3025
#include"common/logging.h"
31-
26+
#include"libpq-fe.h"
27+
#include"receivelog.h"
28+
#include"streamutil.h"
3229

3330
/* fd and filename for currently open WAL file */
3431
staticWalfile*walfile=NULL;

‎src/bin/pg_basebackup/streamutil.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
#include<sys/time.h>
1818
#include<unistd.h>
1919

20-
/* local includes */
21-
#include"receivelog.h"
22-
#include"streamutil.h"
23-
2420
#include"access/xlog_internal.h"
2521
#include"common/fe_memutils.h"
2622
#include"common/file_perm.h"
@@ -29,6 +25,8 @@
2925
#include"fe_utils/connect.h"
3026
#include"port/pg_bswap.h"
3127
#include"pqexpbuffer.h"
28+
#include"receivelog.h"
29+
#include"streamutil.h"
3230

3331
#defineERRCODE_DUPLICATE_OBJECT "42710"
3432

‎src/bin/pg_basebackup/walmethods.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121
#include<zlib.h>
2222
#endif
2323

24-
#include"pgtar.h"
2524
#include"common/file_perm.h"
2625
#include"common/file_utils.h"
27-
26+
#include"pgtar.h"
2827
#include"receivelog.h"
2928
#include"streamutil.h"
3029

‎src/bin/pg_config/pg_config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
#include"postgres_fe.h"
2626

27-
#include"port.h"
2827
#include"common/config_info.h"
28+
#include"port.h"
2929

3030
staticconstchar*progname;
3131

‎src/bin/pg_controldata/pg_controldata.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626
#include"catalog/pg_control.h"
2727
#include"common/controldata_utils.h"
2828
#include"common/logging.h"
29-
#include"pg_getopt.h"
3029
#include"getopt_long.h"
31-
30+
#include"pg_getopt.h"
3231

3332
staticvoid
3433
usage(constchar*progname)

‎src/bin/pg_dump/common.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515
*/
1616
#include"postgres_fe.h"
1717

18-
#include"pg_backup_archiver.h"
19-
#include"pg_backup_utils.h"
20-
#include"pg_dump.h"
21-
2218
#include<ctype.h>
2319

2420
#include"catalog/pg_class_d.h"
2521
#include"fe_utils/string_utils.h"
26-
22+
#include"pg_backup_archiver.h"
23+
#include"pg_backup_utils.h"
24+
#include"pg_dump.h"
2725

2826
/*
2927
* Variables for mapping DumpId to DumpableObject

‎src/bin/pg_dump/parallel.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@
6161
#include<sys/select.h>
6262
#endif
6363

64+
#include"fe_utils/string_utils.h"
6465
#include"parallel.h"
6566
#include"pg_backup_utils.h"
66-
67-
#include"fe_utils/string_utils.h"
6867
#include"port/pg_bswap.h"
6968

7069
/* Mnemonic macros for indexing the fd array returned by pipe(2) */

‎src/bin/pg_dump/pg_backup_archiver.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,13 @@
3030
#include<io.h>
3131
#endif
3232

33+
#include"dumputils.h"
34+
#include"fe_utils/string_utils.h"
35+
#include"libpq/libpq-fs.h"
3336
#include"parallel.h"
3437
#include"pg_backup_archiver.h"
3538
#include"pg_backup_db.h"
3639
#include"pg_backup_utils.h"
37-
#include"dumputils.h"
38-
#include"fe_utils/string_utils.h"
39-
40-
#include"libpq/libpq-fs.h"
4140

4241
#defineTEXT_DUMP_HEADER "--\n-- PostgreSQL database dump\n--\n\n"
4342
#defineTEXT_DUMPALL_HEADER "--\n-- PostgreSQL database cluster dump\n--\n\n"

‎src/bin/pg_dump/pg_backup_custom.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@
2525
*/
2626
#include"postgres_fe.h"
2727

28+
#include"common/file_utils.h"
2829
#include"compress_io.h"
2930
#include"parallel.h"
3031
#include"pg_backup_utils.h"
31-
#include"common/file_utils.h"
32-
3332

3433
/*--------
3534
* Routines in the format interface

‎src/bin/pg_dump/pg_backup_db.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,19 @@
1111
*/
1212
#include"postgres_fe.h"
1313

14-
#include"fe_utils/connect.h"
15-
#include"fe_utils/string_utils.h"
16-
17-
#include"dumputils.h"
18-
#include"parallel.h"
19-
#include"pg_backup_archiver.h"
20-
#include"pg_backup_db.h"
21-
#include"pg_backup_utils.h"
22-
2314
#include<unistd.h>
2415
#include<ctype.h>
2516
#ifdefHAVE_TERMIOS_H
2617
#include<termios.h>
2718
#endif
2819

20+
#include"dumputils.h"
21+
#include"fe_utils/connect.h"
22+
#include"fe_utils/string_utils.h"
23+
#include"parallel.h"
24+
#include"pg_backup_archiver.h"
25+
#include"pg_backup_db.h"
26+
#include"pg_backup_utils.h"
2927

3028
staticvoid_check_database_version(ArchiveHandle*AH);
3129
staticPGconn*_connectDB(ArchiveHandle*AH,constchar*newdbname,constchar*newUser);

‎src/bin/pg_dump/pg_backup_directory.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
*/
3535
#include"postgres_fe.h"
3636

37+
#include<dirent.h>
38+
#include<sys/stat.h>
39+
40+
#include"common/file_utils.h"
3741
#include"compress_io.h"
3842
#include"parallel.h"
3943
#include"pg_backup_utils.h"
40-
#include"common/file_utils.h"
41-
42-
#include<dirent.h>
43-
#include<sys/stat.h>
4444

4545
typedefstruct
4646
{

‎src/bin/pg_dump/pg_backup_null.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
*/
2424
#include"postgres_fe.h"
2525

26-
#include"pg_backup_archiver.h"
27-
#include"pg_backup_utils.h"
2826
#include"fe_utils/string_utils.h"
29-
3027
#include"libpq/libpq-fs.h"
28+
#include"pg_backup_archiver.h"
29+
#include"pg_backup_utils.h"
3130

3231
staticvoid_WriteData(ArchiveHandle*AH,constvoid*data,size_tdLen);
3332
staticvoid_WriteBlobData(ArchiveHandle*AH,constvoid*data,size_tdLen);

‎src/bin/pg_dump/pg_backup_tar.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929
*/
3030
#include"postgres_fe.h"
3131

32-
#include"pg_backup_archiver.h"
33-
#include"pg_backup_tar.h"
34-
#include"pg_backup_utils.h"
35-
#include"pgtar.h"
36-
#include"common/file_utils.h"
37-
#include"fe_utils/string_utils.h"
38-
3932
#include<sys/stat.h>
4033
#include<ctype.h>
4134
#include<limits.h>
4235
#include<unistd.h>
4336

37+
#include"common/file_utils.h"
38+
#include"fe_utils/string_utils.h"
39+
#include"pg_backup_archiver.h"
40+
#include"pg_backup_tar.h"
41+
#include"pg_backup_utils.h"
42+
#include"pgtar.h"
43+
4444
staticvoid_ArchiveEntry(ArchiveHandle*AH,TocEntry*te);
4545
staticvoid_StartData(ArchiveHandle*AH,TocEntry*te);
4646
staticvoid_WriteData(ArchiveHandle*AH,constvoid*data,size_tdLen);

‎src/bin/pg_dump/pg_dump.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
#include <termios.h>
3939
#endif
4040

41-
#include "getopt_long.h"
42-
4341
#include "access/attnum.h"
4442
#include "access/sysattr.h"
4543
#include "access/transam.h"
@@ -54,17 +52,16 @@
5452
#include "catalog/pg_proc_d.h"
5553
#include "catalog/pg_trigger_d.h"
5654
#include "catalog/pg_type_d.h"
57-
#include "libpq/libpq-fs.h"
58-
#include "storage/block.h"
59-
6055
#include "dumputils.h"
56+
#include "fe_utils/connect.h"
57+
#include "fe_utils/string_utils.h"
58+
#include "getopt_long.h"
59+
#include "libpq/libpq-fs.h"
6160
#include "parallel.h"
6261
#include "pg_backup_db.h"
6362
#include "pg_backup_utils.h"
6463
#include "pg_dump.h"
65-
#include "fe_utils/connect.h"
66-
#include "fe_utils/string_utils.h"
67-
64+
#include "storage/block.h"
6865

6966
typedef struct
7067
{

‎src/bin/pg_dump/pg_dump_sort.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
*/
1616
#include"postgres_fe.h"
1717

18+
#include"catalog/pg_class_d.h"
1819
#include"pg_backup_archiver.h"
1920
#include"pg_backup_utils.h"
2021
#include"pg_dump.h"
2122

22-
#include"catalog/pg_class_d.h"
23-
2423
/*
2524
* Sort priority for database object types.
2625
* Objects are sorted by type, and within a type by name.

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818
#include<time.h>
1919
#include<unistd.h>
2020

21-
#include"getopt_long.h"
22-
23-
#include"dumputils.h"
24-
#include"pg_backup.h"
2521
#include"common/file_utils.h"
2622
#include"common/logging.h"
23+
#include"dumputils.h"
2724
#include"fe_utils/connect.h"
2825
#include"fe_utils/string_utils.h"
26+
#include"getopt_long.h"
27+
#include"pg_backup.h"
2928

3029
/* version string we expect back from pg_dump */
3130
#definePGDUMP_VERSIONSTR "pg_dump (PostgreSQL) " PG_VERSION "\n"

‎src/bin/pg_dump/pg_restore.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,11 @@
4545
#include<termios.h>
4646
#endif
4747

48-
#include"getopt_long.h"
49-
5048
#include"dumputils.h"
49+
#include"getopt_long.h"
5150
#include"parallel.h"
5251
#include"pg_backup_utils.h"
5352

54-
5553
staticvoidusage(constchar*progname);
5654

5755
int

‎src/bin/pg_resetwal/pg_resetwal.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
#include<time.h>
4545
#include<unistd.h>
4646

47-
#include"access/transam.h"
4847
#include"access/heaptoast.h"
4948
#include"access/multixact.h"
49+
#include"access/transam.h"
5050
#include"access/xlog.h"
5151
#include"access/xlog_internal.h"
5252
#include"common/controldata_utils.h"
@@ -55,10 +55,9 @@
5555
#include"common/logging.h"
5656
#include"common/restricted_token.h"
5757
#include"common/string.h"
58-
#include"storage/large_object.h"
59-
#include"pg_getopt.h"
6058
#include"getopt_long.h"
61-
59+
#include"pg_getopt.h"
60+
#include"storage/large_object.h"
6261

6362
staticControlFileDataControlFile;/* pg_control values */
6463
staticXLogSegNonewXlogSegNo;/* new XLOG segment # */

‎src/bin/pg_rewind/datapagemap.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212

1313
#include"postgres_fe.h"
1414

15-
#include"datapagemap.h"
16-
1715
#include"common/logging.h"
16+
#include"datapagemap.h"
1817

1918
structdatapagemap_iterator
2019
{

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp