Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dddf4cd

Browse files
author
Amit Kapila
committed
Make the order of the header file includes consistent in non-backend modules.
Similar to commit 7e73503, this commit makes the order of header file inclusion consistent for non-backend modules. In passing, fix the case where we were using angle brackets (<>) for the local module includes instead of quotes (""). Author: Vignesh C Reviewed-by: Amit Kapila Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
1 parent 8270a0d commit dddf4cd

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
const char *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
#define RECONNECT_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
#define RECONNECT_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
static Walfile *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
#define ERRCODE_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
static const char *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
static void
3433
usage(const char *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

0 commit comments

Comments
 (0)