NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitdddf4cd

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 commitdddf4cdCopy full SHA for dddf4cd

File tree

102 files changed

+237

-345

lines changed

src
- bin
  - pg_archivecleanup
    - pg_archivecleanup.c
  - pg_basebackup
  - pg_config
    - pg_config.c
  - pg_controldata
    - pg_controldata.c
  - pg_dump
  - pg_resetwal
    - pg_resetwal.c
  - pg_rewind
  - pg_test_fsync
    - pg_test_fsync.c
  - pg_upgrade
  - pg_waldump
    - compat.c
    - pg_waldump.c
  - pgbench
    - pgbench.c
  - psql
- common
  - f2s.c
- fe_utils
- interfaces
  - ecpg
    - compatlib
      - informix.c
    - ecpglib
    - pgtypeslib
    - preproc
      - c_keywords.c
      - ecpg_keywords.c
  - libpq
- pl/plpgsql/src
- port
- test
  - isolation
    - isolationtester.c
  - modules
    - test_ginpostinglist
      - test_ginpostinglist.c
    - test_integerset
      - test_integerset.c
    - test_rls_hooks
      - test_rls_hooks.c
    - test_shm_mq
      - setup.c
  - regress
    - pg_regress.c
    - regress.c

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 number	Diff line number	Diff line change
`@@ -15,11 +15,9 @@`
`15`	`15`	`#include<signal.h>`
`16`	`16`	`#include<sys/time.h>`
`17`	`17`
`18`		`-#include"pg_getopt.h"`
`19`		`-`
`20`		`-#include"common/logging.h"`
`21`		`-`
`22`	`18`	`#include"access/xlog_internal.h"`
	`19`	`+#include"common/logging.h"`
	`20`	`+#include"pg_getopt.h"`
`23`	`21`
`24`	`22`	`constchar*progname;`
`25`	`23`

`‎src/bin/pg_basebackup/pg_basebackup.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@`
`35`	`35`	`#include"fe_utils/string_utils.h"`
`36`	`36`	`#include"getopt_long.h"`
`37`	`37`	`#include"libpq-fe.h"`
`38`		`-#include"pqexpbuffer.h"`
`39`	`38`	`#include"pgtar.h"`
`40`	`39`	`#include"pgtime.h"`
	`40`	`+#include"pqexpbuffer.h"`
`41`	`41`	`#include"receivelog.h"`
`42`	`42`	`#include"replication/basebackup.h"`
`43`	`43`	`#include"streamutil.h"`

`‎src/bin/pg_basebackup/pg_receivewal.c‎`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,14 @@`
`19`	`19`	`#include<sys/stat.h>`
`20`	`20`	`#include<unistd.h>`
`21`	`21`
	`22`	`+#include"access/xlog_internal.h"`
`22`	`23`	`#include"common/file_perm.h"`
`23`	`24`	`#include"common/logging.h"`
`24`		`-#include"libpq-fe.h"`
`25`		`-#include"access/xlog_internal.h"`
`26`	`25`	`#include"getopt_long.h"`
`27`		`-`
	`26`	`+#include"libpq-fe.h"`
`28`	`27`	`#include"receivelog.h"`
`29`	`28`	`#include"streamutil.h"`
`30`	`29`
`31`		`-`
`32`	`30`	`/* Time to sleep between reconnection attempts */`
`33`	`31`	`#defineRECONNECT_SLEEP_TIME 5`
`34`	`32`

`‎src/bin/pg_basebackup/pg_recvlogical.c‎`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,18 +19,15 @@`
`19`	`19`	`#include<sys/select.h>`
`20`	`20`	`#endif`
`21`	`21`
`22`		`-/* local includes */`
`23`		`-#include"streamutil.h"`
`24`		`-`
`25`	`22`	`#include"access/xlog_internal.h"`
`26`		`-#include"common/file_perm.h"`
`27`	`23`	`#include"common/fe_memutils.h"`
	`24`	`+#include"common/file_perm.h"`
`28`	`25`	`#include"common/logging.h"`
`29`	`26`	`#include"getopt_long.h"`
`30`	`27`	`#include"libpq-fe.h"`
`31`	`28`	`#include"libpq/pqsignal.h"`
`32`	`29`	`#include"pqexpbuffer.h"`
`33`		`-`
	`30`	`+#include"streamutil.h"`
`34`	`31`
`35`	`32`	`/* Time to sleep between reconnection attempts */`
`36`	`33`	`#defineRECONNECT_SLEEP_TIME 5`

`‎src/bin/pg_basebackup/receivelog.c‎`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,12 @@`
`20`	`20`	`#include<sys/select.h>`
`21`	`21`	`#endif`
`22`	`22`
`23`		`-/* local includes */`
`24`		`-#include"receivelog.h"`
`25`		`-#include"streamutil.h"`
`26`		`-`
`27`		`-#include"libpq-fe.h"`
`28`	`23`	`#include"access/xlog_internal.h"`
`29`	`24`	`#include"common/file_utils.h"`
`30`	`25`	`#include"common/logging.h"`
`31`		`-`
	`26`	`+#include"libpq-fe.h"`
	`27`	`+#include"receivelog.h"`
	`28`	`+#include"streamutil.h"`
`32`	`29`
`33`	`30`	`/* fd and filename for currently open WAL file */`
`34`	`31`	`staticWalfile*walfile=NULL;`

`‎src/bin/pg_basebackup/streamutil.c‎`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,6 @@`
`17`	`17`	`#include<sys/time.h>`
`18`	`18`	`#include<unistd.h>`
`19`	`19`
`20`		`-/* local includes */`
`21`		`-#include"receivelog.h"`
`22`		`-#include"streamutil.h"`
`23`		`-`
`24`	`20`	`#include"access/xlog_internal.h"`
`25`	`21`	`#include"common/fe_memutils.h"`
`26`	`22`	`#include"common/file_perm.h"`
`@@ -29,6 +25,8 @@`
`29`	`25`	`#include"fe_utils/connect.h"`
`30`	`26`	`#include"port/pg_bswap.h"`
`31`	`27`	`#include"pqexpbuffer.h"`
	`28`	`+#include"receivelog.h"`
	`29`	`+#include"streamutil.h"`
`32`	`30`
`33`	`31`	`#defineERRCODE_DUPLICATE_OBJECT "42710"`
`34`	`32`

`‎src/bin/pg_basebackup/walmethods.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,9 @@`
`21`	`21`	`#include<zlib.h>`
`22`	`22`	`#endif`
`23`	`23`
`24`		`-#include"pgtar.h"`
`25`	`24`	`#include"common/file_perm.h"`
`26`	`25`	`#include"common/file_utils.h"`
`27`		`-`
	`26`	`+#include"pgtar.h"`
`28`	`27`	`#include"receivelog.h"`
`29`	`28`	`#include"streamutil.h"`
`30`	`29`

`‎src/bin/pg_config/pg_config.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`
`25`	`25`	`#include"postgres_fe.h"`
`26`	`26`
`27`		`-#include"port.h"`
`28`	`27`	`#include"common/config_info.h"`
	`28`	`+#include"port.h"`
`29`	`29`
`30`	`30`	`staticconstchar*progname;`
`31`	`31`

`‎src/bin/pg_controldata/pg_controldata.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,8 @@`
`26`	`26`	`#include"catalog/pg_control.h"`
`27`	`27`	`#include"common/controldata_utils.h"`
`28`	`28`	`#include"common/logging.h"`
`29`		`-#include"pg_getopt.h"`
`30`	`29`	`#include"getopt_long.h"`
`31`		`-`
	`30`	`+#include"pg_getopt.h"`
`32`	`31`
`33`	`32`	`staticvoid`
`34`	`33`	`usage(constchar*progname)`

`‎src/bin/pg_dump/common.c‎`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,13 @@`
`15`	`15`	`*/`
`16`	`16`	`#include"postgres_fe.h"`
`17`	`17`
`18`		`-#include"pg_backup_archiver.h"`
`19`		`-#include"pg_backup_utils.h"`
`20`		`-#include"pg_dump.h"`
`21`		`-`
`22`	`18`	`#include<ctype.h>`
`23`	`19`
`24`	`20`	`#include"catalog/pg_class_d.h"`
`25`	`21`	`#include"fe_utils/string_utils.h"`
`26`		`-`
	`22`	`+#include"pg_backup_archiver.h"`
	`23`	`+#include"pg_backup_utils.h"`
	`24`	`+#include"pg_dump.h"`
`27`	`25`
`28`	`26`	`/*`
`29`	`27`	`* Variables for mapping DumpId to DumpableObject`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitdddf4cd

File tree

102 files changed

Some content is hidden

102 files changed

`‎src/bin/pg_archivecleanup/pg_archivecleanup.c‎`

`‎src/bin/pg_basebackup/pg_basebackup.c‎`

`‎src/bin/pg_basebackup/pg_receivewal.c‎`

`‎src/bin/pg_basebackup/pg_recvlogical.c‎`

`‎src/bin/pg_basebackup/receivelog.c‎`

`‎src/bin/pg_basebackup/streamutil.c‎`

`‎src/bin/pg_basebackup/walmethods.c‎`

`‎src/bin/pg_config/pg_config.c‎`

`‎src/bin/pg_controldata/pg_controldata.c‎`

`‎src/bin/pg_dump/common.c‎`

0 commit comments