Browse Source

Make the order of the header file includes consistent in non-backend modules.

Similar to commit 7e735035f2, 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
master
Amit Kapila 1 month ago
parent
commit
dddf4cdc33
100 changed files with 235 additions and 341 deletions
  1. +2
    -4
      src/bin/pg_archivecleanup/pg_archivecleanup.c
  2. +1
    -1
      src/bin/pg_basebackup/pg_basebackup.c
  3. +2
    -4
      src/bin/pg_basebackup/pg_receivewal.c
  4. +2
    -5
      src/bin/pg_basebackup/pg_recvlogical.c
  5. +3
    -6
      src/bin/pg_basebackup/receivelog.c
  6. +2
    -4
      src/bin/pg_basebackup/streamutil.c
  7. +1
    -2
      src/bin/pg_basebackup/walmethods.c
  8. +1
    -1
      src/bin/pg_config/pg_config.c
  9. +1
    -2
      src/bin/pg_controldata/pg_controldata.c
  10. +3
    -5
      src/bin/pg_dump/common.c
  11. +1
    -2
      src/bin/pg_dump/parallel.c
  12. +3
    -4
      src/bin/pg_dump/pg_backup_archiver.c
  13. +1
    -2
      src/bin/pg_dump/pg_backup_custom.c
  14. +7
    -9
      src/bin/pg_dump/pg_backup_db.c
  15. +4
    -4
      src/bin/pg_dump/pg_backup_directory.c
  16. +2
    -3
      src/bin/pg_dump/pg_backup_null.c
  17. +7
    -7
      src/bin/pg_dump/pg_backup_tar.c
  18. +5
    -8
      src/bin/pg_dump/pg_dump.c
  19. +1
    -2
      src/bin/pg_dump/pg_dump_sort.c
  20. +3
    -4
      src/bin/pg_dump/pg_dumpall.c
  21. +1
    -3
      src/bin/pg_dump/pg_restore.c
  22. +3
    -4
      src/bin/pg_resetwal/pg_resetwal.c
  23. +1
    -2
      src/bin/pg_rewind/datapagemap.c
  24. +1
    -1
      src/bin/pg_rewind/fetch.c
  25. +2
    -3
      src/bin/pg_rewind/filemap.c
  26. +3
    -4
      src/bin/pg_rewind/libpq_fetch.c
  27. +2
    -4
      src/bin/pg_rewind/parsexlog.c
  28. +4
    -5
      src/bin/pg_rewind/pg_rewind.c
  29. +1
    -2
      src/bin/pg_rewind/timeline.c
  30. +1
    -2
      src/bin/pg_test_fsync/pg_test_fsync.c
  31. +0
    -1
      src/bin/pg_upgrade/check.c
  32. +2
    -2
      src/bin/pg_upgrade/controldata.c
  33. +1
    -3
      src/bin/pg_upgrade/dump.c
  34. +6
    -7
      src/bin/pg_upgrade/file.c
  35. +1
    -3
      src/bin/pg_upgrade/function.c
  36. +1
    -3
      src/bin/pg_upgrade/info.c
  37. +2
    -4
      src/bin/pg_upgrade/option.c
  38. +0
    -1
      src/bin/pg_upgrade/parallel.c
  39. +5
    -5
      src/bin/pg_upgrade/pg_upgrade.c
  40. +3
    -4
      src/bin/pg_upgrade/relfilenode.c
  41. +0
    -1
      src/bin/pg_upgrade/server.c
  42. +2
    -3
      src/bin/pg_upgrade/util.c
  43. +1
    -4
      src/bin/pg_upgrade/version.c
  44. +1
    -1
      src/bin/pg_waldump/compat.c
  45. +1
    -2
      src/bin/pg_waldump/pg_waldump.c
  46. +8
    -7
      src/bin/pgbench/pgbench.c
  47. +4
    -6
      src/bin/psql/common.c
  48. +4
    -6
      src/bin/psql/copy.c
  49. +1
    -2
      src/bin/psql/crosstabview.c
  50. +2
    -5
      src/bin/psql/describe.c
  51. +1
    -2
      src/bin/psql/help.c
  52. +2
    -3
      src/bin/psql/input.c
  53. +2
    -3
      src/bin/psql/large_obj.c
  54. +3
    -5
      src/bin/psql/mainloop.c
  55. +1
    -2
      src/bin/psql/prompt.c
  56. +3
    -7
      src/bin/psql/startup.c
  57. +1
    -3
      src/bin/psql/variables.c
  58. +1
    -2
      src/common/f2s.c
  59. +1
    -3
      src/fe_utils/print.c
  60. +1
    -2
      src/fe_utils/recovery_gen.c
  61. +1
    -3
      src/fe_utils/string_utils.c
  62. +8
    -8
      src/interfaces/ecpg/compatlib/informix.c
  63. +2
    -2
      src/interfaces/ecpg/ecpglib/connect.c
  64. +5
    -5
      src/interfaces/ecpg/ecpglib/data.c
  65. +2
    -3
      src/interfaces/ecpg/ecpglib/descriptor.c
  66. +1
    -1
      src/interfaces/ecpg/ecpglib/error.c
  67. +8
    -9
      src/interfaces/ecpg/ecpglib/execute.c
  68. +2
    -2
      src/interfaces/ecpg/ecpglib/memory.c
  69. +6
    -5
      src/interfaces/ecpg/ecpglib/misc.c
  70. +2
    -2
      src/interfaces/ecpg/ecpglib/prepare.c
  71. +4
    -5
      src/interfaces/ecpg/ecpglib/sqlda.c
  72. +2
    -3
      src/interfaces/ecpg/ecpglib/typename.c
  73. +1
    -1
      src/interfaces/ecpg/pgtypeslib/common.c
  74. +2
    -2
      src/interfaces/ecpg/pgtypeslib/datetime.c
  75. +1
    -1
      src/interfaces/ecpg/pgtypeslib/dt_common.c
  76. +2
    -2
      src/interfaces/ecpg/pgtypeslib/interval.c
  77. +3
    -2
      src/interfaces/ecpg/pgtypeslib/numeric.c
  78. +2
    -3
      src/interfaces/ecpg/pgtypeslib/timestamp.c
  79. +2
    -3
      src/interfaces/ecpg/preproc/c_keywords.c
  80. +2
    -3
      src/interfaces/ecpg/preproc/ecpg_keywords.c
  81. +1
    -2
      src/interfaces/libpq/fe-auth.c
  82. +7
    -9
      src/interfaces/libpq/fe-connect.c
  83. +4
    -5
      src/interfaces/libpq/fe-exec.c
  84. +1
    -2
      src/interfaces/libpq/fe-misc.c
  85. +3
    -5
      src/interfaces/libpq/fe-protocol2.c
  86. +4
    -6
      src/interfaces/libpq/fe-protocol3.c
  87. +1
    -1
      src/interfaces/libpq/fe-secure-gssapi.c
  88. +4
    -4
      src/interfaces/libpq/fe-secure.c
  89. +1
    -3
      src/pl/plpgsql/src/pl_comp.c
  90. +1
    -3
      src/pl/plpgsql/src/pl_exec.c
  91. +1
    -3
      src/pl/plpgsql/src/pl_funcs.c
  92. +1
    -3
      src/pl/plpgsql/src/pl_handler.c
  93. +2
    -2
      src/port/pg_crc32c_armv8.c
  94. +2
    -2
      src/port/pg_crc32c_sse42.c
  95. +3
    -1
      src/port/tar.c
  96. +2
    -3
      src/test/isolation/isolationtester.c
  97. +1
    -1
      src/test/modules/test_ginpostinglist/test_ginpostinglist.c
  98. +3
    -3
      src/test/modules/test_integerset/test_integerset.c
  99. +2
    -5
      src/test/modules/test_rls_hooks/test_rls_hooks.c
  100. +1
    -2
      src/test/modules/test_shm_mq/setup.c

+ 2
- 4
src/bin/pg_archivecleanup/pg_archivecleanup.c View File

@@ -15,11 +15,9 @@
#include <signal.h>
#include <sys/time.h>

#include "pg_getopt.h"

#include "common/logging.h"

#include "access/xlog_internal.h"
#include "common/logging.h"
#include "pg_getopt.h"

const char *progname;


+ 1
- 1
src/bin/pg_basebackup/pg_basebackup.c View File

@@ -35,9 +35,9 @@
#include "fe_utils/string_utils.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "pqexpbuffer.h"
#include "pgtar.h"
#include "pgtime.h"
#include "pqexpbuffer.h"
#include "receivelog.h"
#include "replication/basebackup.h"
#include "streamutil.h"

+ 2
- 4
src/bin/pg_basebackup/pg_receivewal.c View File

@@ -19,16 +19,14 @@
#include <sys/stat.h>
#include <unistd.h>

#include "access/xlog_internal.h"
#include "common/file_perm.h"
#include "common/logging.h"
#include "libpq-fe.h"
#include "access/xlog_internal.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "receivelog.h"
#include "streamutil.h"


/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5


+ 2
- 5
src/bin/pg_basebackup/pg_recvlogical.c View File

@@ -19,18 +19,15 @@
#include <sys/select.h>
#endif

/* local includes */
#include "streamutil.h"

#include "access/xlog_internal.h"
#include "common/file_perm.h"
#include "common/fe_memutils.h"
#include "common/file_perm.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "libpq/pqsignal.h"
#include "pqexpbuffer.h"
#include "streamutil.h"

/* Time to sleep between reconnection attempts */
#define RECONNECT_SLEEP_TIME 5

+ 3
- 6
src/bin/pg_basebackup/receivelog.c View File

@@ -20,15 +20,12 @@
#include <sys/select.h>
#endif

/* local includes */
#include "receivelog.h"
#include "streamutil.h"

#include "libpq-fe.h"
#include "access/xlog_internal.h"
#include "common/file_utils.h"
#include "common/logging.h"

#include "libpq-fe.h"
#include "receivelog.h"
#include "streamutil.h"

/* fd and filename for currently open WAL file */
static Walfile *walfile = NULL;

+ 2
- 4
src/bin/pg_basebackup/streamutil.c View File

@@ -17,10 +17,6 @@
#include <sys/time.h>
#include <unistd.h>

/* local includes */
#include "receivelog.h"
#include "streamutil.h"

#include "access/xlog_internal.h"
#include "common/fe_memutils.h"
#include "common/file_perm.h"
@@ -29,6 +25,8 @@
#include "fe_utils/connect.h"
#include "port/pg_bswap.h"
#include "pqexpbuffer.h"
#include "receivelog.h"
#include "streamutil.h"

#define ERRCODE_DUPLICATE_OBJECT "42710"


+ 1
- 2
src/bin/pg_basebackup/walmethods.c View File

@@ -21,10 +21,9 @@
#include <zlib.h>
#endif

#include "pgtar.h"
#include "common/file_perm.h"
#include "common/file_utils.h"
#include "pgtar.h"
#include "receivelog.h"
#include "streamutil.h"


+ 1
- 1
src/bin/pg_config/pg_config.c View File

@@ -24,8 +24,8 @@

#include "postgres_fe.h"

#include "port.h"
#include "common/config_info.h"
#include "port.h"

static const char *progname;


+ 1
- 2
src/bin/pg_controldata/pg_controldata.c View File

@@ -26,9 +26,8 @@
#include "catalog/pg_control.h"
#include "common/controldata_utils.h"
#include "common/logging.h"
#include "pg_getopt.h"
#include "getopt_long.h"
#include "pg_getopt.h"

static void
usage(const char *progname)

+ 3
- 5
src/bin/pg_dump/common.c View File

@@ -15,15 +15,13 @@
*/
#include "postgres_fe.h"

#include "pg_backup_archiver.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"

#include <ctype.h>

#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"

#include "pg_backup_archiver.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"

/*
* Variables for mapping DumpId to DumpableObject

+ 1
- 2
src/bin/pg_dump/parallel.c View File

@@ -61,10 +61,9 @@
#include <sys/select.h>
#endif

#include "fe_utils/string_utils.h"
#include "parallel.h"
#include "pg_backup_utils.h"

#include "fe_utils/string_utils.h"
#include "port/pg_bswap.h"

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

+ 3
- 4
src/bin/pg_dump/pg_backup_archiver.c View File

@@ -30,14 +30,13 @@
#include <io.h>
#endif

#include "dumputils.h"
#include "fe_utils/string_utils.h"
#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_archiver.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
#include "dumputils.h"
#include "fe_utils/string_utils.h"

#include "libpq/libpq-fs.h"

#define TEXT_DUMP_HEADER "--\n-- PostgreSQL database dump\n--\n\n"
#define TEXT_DUMPALL_HEADER "--\n-- PostgreSQL database cluster dump\n--\n\n"

+ 1
- 2
src/bin/pg_dump/pg_backup_custom.c View File

@@ -25,11 +25,10 @@
*/
#include "postgres_fe.h"

#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
#include "common/file_utils.h"


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

+ 7
- 9
src/bin/pg_dump/pg_backup_db.c View File

@@ -11,21 +11,19 @@
*/
#include "postgres_fe.h"

#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"

#include "dumputils.h"
#include "parallel.h"
#include "pg_backup_archiver.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"

#include <unistd.h>
#include <ctype.h>
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif

#include "dumputils.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"
#include "parallel.h"
#include "pg_backup_archiver.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"

static void _check_database_version(ArchiveHandle *AH);
static PGconn *_connectDB(ArchiveHandle *AH, const char *newdbname, const char *newUser);

+ 4
- 4
src/bin/pg_dump/pg_backup_directory.c View File

@@ -34,13 +34,13 @@
*/
#include "postgres_fe.h"

#include <dirent.h>
#include <sys/stat.h>

#include "common/file_utils.h"
#include "compress_io.h"
#include "parallel.h"
#include "pg_backup_utils.h"
#include "common/file_utils.h"

#include <dirent.h>
#include <sys/stat.h>

typedef struct
{

+ 2
- 3
src/bin/pg_dump/pg_backup_null.c View File

@@ -23,11 +23,10 @@
*/
#include "postgres_fe.h"

#include "pg_backup_archiver.h"
#include "pg_backup_utils.h"
#include "fe_utils/string_utils.h"

#include "libpq/libpq-fs.h"
#include "pg_backup_archiver.h"
#include "pg_backup_utils.h"

static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
static void _WriteBlobData(ArchiveHandle *AH, const void *data, size_t dLen);

+ 7
- 7
src/bin/pg_dump/pg_backup_tar.c View File

@@ -29,18 +29,18 @@
*/
#include "postgres_fe.h"

#include "pg_backup_archiver.h"
#include "pg_backup_tar.h"
#include "pg_backup_utils.h"
#include "pgtar.h"
#include "common/file_utils.h"
#include "fe_utils/string_utils.h"

#include <sys/stat.h>
#include <ctype.h>
#include <limits.h>
#include <unistd.h>

#include "common/file_utils.h"
#include "fe_utils/string_utils.h"
#include "pg_backup_archiver.h"
#include "pg_backup_tar.h"
#include "pg_backup_utils.h"
#include "pgtar.h"

static void _ArchiveEntry(ArchiveHandle *AH, TocEntry *te);
static void _StartData(ArchiveHandle *AH, TocEntry *te);
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);

+ 5
- 8
src/bin/pg_dump/pg_dump.c View File

@@ -38,8 +38,6 @@
#include <termios.h>
#endif

#include "getopt_long.h"

#include "access/attnum.h"
#include "access/sysattr.h"
#include "access/transam.h"
@@ -54,17 +52,16 @@
#include "catalog/pg_proc_d.h"
#include "catalog/pg_trigger_d.h"
#include "catalog/pg_type_d.h"
#include "libpq/libpq-fs.h"
#include "storage/block.h"

#include "dumputils.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"
#include "getopt_long.h"
#include "libpq/libpq-fs.h"
#include "parallel.h"
#include "pg_backup_db.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"

#include "storage/block.h"

typedef struct
{

+ 1
- 2
src/bin/pg_dump/pg_dump_sort.c View File

@@ -15,12 +15,11 @@
*/
#include "postgres_fe.h"

#include "catalog/pg_class_d.h"
#include "pg_backup_archiver.h"
#include "pg_backup_utils.h"
#include "pg_dump.h"

#include "catalog/pg_class_d.h"

/*
* Sort priority for database object types.
* Objects are sorted by type, and within a type by name.

+ 3
- 4
src/bin/pg_dump/pg_dumpall.c View File

@@ -18,14 +18,13 @@
#include <time.h>
#include <unistd.h>

#include "getopt_long.h"

#include "dumputils.h"
#include "pg_backup.h"
#include "common/file_utils.h"
#include "common/logging.h"
#include "dumputils.h"
#include "fe_utils/connect.h"
#include "fe_utils/string_utils.h"
#include "getopt_long.h"
#include "pg_backup.h"

/* version string we expect back from pg_dump */
#define PGDUMP_VERSIONSTR "pg_dump (PostgreSQL) " PG_VERSION "\n"

+ 1
- 3
src/bin/pg_dump/pg_restore.c View File

@@ -45,13 +45,11 @@
#include <termios.h>
#endif

#include "getopt_long.h"

#include "dumputils.h"
#include "getopt_long.h"
#include "parallel.h"
#include "pg_backup_utils.h"


static void usage(const char *progname);

int

+ 3
- 4
src/bin/pg_resetwal/pg_resetwal.c View File

@@ -44,9 +44,9 @@
#include <time.h>
#include <unistd.h>

#include "access/transam.h"
#include "access/heaptoast.h"
#include "access/multixact.h"
#include "access/transam.h"
#include "access/xlog.h"
#include "access/xlog_internal.h"
#include "common/controldata_utils.h"
@@ -55,10 +55,9 @@
#include "common/logging.h"
#include "common/restricted_token.h"
#include "common/string.h"
#include "storage/large_object.h"
#include "pg_getopt.h"
#include "getopt_long.h"

#include "pg_getopt.h"
#include "storage/large_object.h"

static ControlFileData ControlFile; /* pg_control values */
static XLogSegNo newXlogSegNo; /* new XLOG segment # */

+ 1
- 2
src/bin/pg_rewind/datapagemap.c View File

@@ -12,9 +12,8 @@

#include "postgres_fe.h"

#include "datapagemap.h"

#include "common/logging.h"
#include "datapagemap.h"

struct datapagemap_iterator
{

+ 1
- 1
src/bin/pg_rewind/fetch.c View File

@@ -19,10 +19,10 @@
#include <sys/stat.h>
#include <unistd.h>

#include "pg_rewind.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
#include "pg_rewind.h"

void
fetchSourceFileList(void)

+ 2
- 3
src/bin/pg_rewind/filemap.c View File

@@ -13,12 +13,11 @@
#include <sys/stat.h>
#include <unistd.h>

#include "catalog/pg_tablespace_d.h"
#include "common/string.h"
#include "datapagemap.h"
#include "filemap.h"
#include "pg_rewind.h"

#include "common/string.h"
#include "catalog/pg_tablespace_d.h"
#include "storage/fd.h"

filemap_t *filemap = NULL;

+ 3
- 4
src/bin/pg_rewind/libpq_fetch.c View File

@@ -14,14 +14,13 @@
#include <fcntl.h>
#include <unistd.h>

#include "pg_rewind.h"
#include "catalog/pg_type_d.h"
#include "datapagemap.h"
#include "fe_utils/connect.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"

#include "catalog/pg_type_d.h"
#include "fe_utils/connect.h"
#include "pg_rewind.h"
#include "port/pg_bswap.h"

PGconn *conn = NULL;

+ 2
- 4
src/bin/pg_rewind/parsexlog.c View File

@@ -13,16 +13,14 @@

#include <unistd.h>

#include "pg_rewind.h"
#include "filemap.h"

#include "access/rmgr.h"
#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "catalog/pg_control.h"
#include "catalog/storage_xlog.h"
#include "commands/dbcommands_xlog.h"

#include "filemap.h"
#include "pg_rewind.h"

/*
* RmgrNames is an array of resource manager names, to make error messages

+ 4
- 5
src/bin/pg_rewind/pg_rewind.c View File

@@ -14,11 +14,6 @@
#include <time.h>
#include <unistd.h>

#include "pg_rewind.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"

#include "access/timeline.h"
#include "access/xlog_internal.h"
#include "catalog/catversion.h"
@@ -28,7 +23,11 @@
#include "common/file_utils.h"
#include "common/restricted_token.h"
#include "fe_utils/recovery_gen.h"
#include "fetch.h"
#include "file_ops.h"
#include "filemap.h"
#include "getopt_long.h"
#include "pg_rewind.h"
#include "storage/bufpage.h"

static void usage(const char *progname);

+ 1
- 2
src/bin/pg_rewind/timeline.c View File

@@ -9,10 +9,9 @@
*/
#include "postgres_fe.h"

#include "pg_rewind.h"

#include "access/timeline.h"
#include "access/xlog_internal.h"
#include "pg_rewind.h"

/*
* This is copy-pasted from the backend readTimeLineHistory, modified to

+ 1
- 2
src/bin/pg_test_fsync/pg_test_fsync.c View File

@@ -12,10 +12,9 @@
#include <unistd.h>
#include <signal.h>

#include "getopt_long.h"
#include "access/xlogdefs.h"
#include "common/logging.h"
#include "getopt_long.h"

/*
* put the temp files in the local directory

+ 0
- 1
src/bin/pg_upgrade/check.c View File

@@ -14,7 +14,6 @@
#include "mb/pg_wchar.h"
#include "pg_upgrade.h"


static void check_new_cluster_is_empty(void);
static void check_databases_are_compatible(void);
static void check_locale_and_encoding(DbInfo *olddb, DbInfo *newdb);

+ 2
- 2
src/bin/pg_upgrade/controldata.c View File

@@ -9,10 +9,10 @@

#include "postgres_fe.h"

#include "pg_upgrade.h"

#include <ctype.h>

#include "pg_upgrade.h"

/*
* get_control_data()
*

+ 1
- 3
src/bin/pg_upgrade/dump.c View File

@@ -9,10 +9,8 @@

#include "postgres_fe.h"

#include "pg_upgrade.h"

#include "fe_utils/string_utils.h"
#include "pg_upgrade.h"

void
generate_old_dump(void)

+ 6
- 7
src/bin/pg_upgrade/file.c View File

@@ -9,13 +9,6 @@

#include "postgres_fe.h"

#include "access/visibilitymap.h"
#include "common/file_perm.h"
#include "pg_upgrade.h"
#include "storage/bufpage.h"
#include "storage/checksum.h"
#include "storage/checksum_impl.h"

#include <sys/stat.h>
#include <fcntl.h>
#ifdef HAVE_COPYFILE_H
@@ -26,6 +19,12 @@
#include <linux/fs.h>
#endif

#include "access/visibilitymap.h"
#include "common/file_perm.h"
#include "pg_upgrade.h"
#include "storage/bufpage.h"
#include "storage/checksum.h"
#include "storage/checksum_impl.h"

#ifdef WIN32
static int win32_pghardlink(const char *src, const char *dst);

+ 1
- 3
src/bin/pg_upgrade/function.c View File

@@ -9,11 +9,9 @@

#include "postgres_fe.h"

#include "pg_upgrade.h"

#include "access/transam.h"
#include "catalog/pg_language_d.h"
#include "pg_upgrade.h"

/*
* qsort comparator for pointers to library names

+ 1
- 3
src/bin/pg_upgrade/info.c View File

@@ -9,11 +9,9 @@

#include "postgres_fe.h"

#include "pg_upgrade.h"

#include "access/transam.h"
#include "catalog/pg_class_d.h"
#include "pg_upgrade.h"

static void create_rel_filename_map(const char *old_data, const char *new_data,
const DbInfo *old_db, const DbInfo *new_db,

+ 2
- 4
src/bin/pg_upgrade/option.c View File

@@ -14,12 +14,10 @@
#include <io.h>
#endif

#include "getopt_long.h"
#include "common/string.h"
#include "utils/pidfile.h"

#include "getopt_long.h"
#include "pg_upgrade.h"
#include "utils/pidfile.h"

static void usage(void);
static void check_required_directory(char **dirpath,

+ 0
- 1
src/bin/pg_upgrade/parallel.c View File

@@ -16,7 +16,6 @@

#include "pg_upgrade.h"


static int parallel_jobs;

#ifdef WIN32

+ 5
- 5
src/bin/pg_upgrade/pg_upgrade.c View File

@@ -37,16 +37,16 @@

#include "postgres_fe.h"

#include "pg_upgrade.h"
#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
#endif

#include "catalog/pg_class_d.h"
#include "common/file_perm.h"
#include "common/logging.h"
#include "common/restricted_token.h"
#include "fe_utils/string_utils.h"

#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
#endif
#include "pg_upgrade.h"

static void prepare_new_cluster(void);
static void prepare_new_globals(void);

+ 3
- 4
src/bin/pg_upgrade/relfilenode.c View File

@@ -9,12 +9,11 @@

#include "postgres_fe.h"

#include "pg_upgrade.h"

#include <sys/stat.h>
#include "catalog/pg_class_d.h"
#include "access/transam.h"

#include "access/transam.h"
#include "catalog/pg_class_d.h"
#include "pg_upgrade.h"

static void transfer_single_new_db(FileNameMap *maps, int size, char *old_tablespace);
static void transfer_relfile(FileNameMap *map, const char *suffix, bool vm_must_add_frozenbit);

+ 0
- 1
src/bin/pg_upgrade/server.c View File

@@ -13,7 +13,6 @@
#include "fe_utils/string_utils.h"
#include "pg_upgrade.h"


static PGconn *get_db_conn(ClusterInfo *cluster, const char *db_name);



+ 2
- 3
src/bin/pg_upgrade/util.c View File

@@ -9,11 +9,10 @@

#include "postgres_fe.h"

#include "common/username.h"
#include "pg_upgrade.h"

#include <signal.h>

#include "common/username.h"
#include "pg_upgrade.h"

LogOpts log_opts;


+ 1
- 4
src/bin/pg_upgrade/version.c View File

@@ -9,12 +9,9 @@

#include "postgres_fe.h"

#include "pg_upgrade.h"

#include "catalog/pg_class_d.h"
#include "fe_utils/string_utils.h"


#include "pg_upgrade.h"

/*
* new_9_0_populate_pg_largeobject_metadata()

+ 1
- 1
src/bin/pg_waldump/compat.c View File

@@ -20,8 +20,8 @@

#include <time.h>

#include "utils/datetime.h"
#include "lib/stringinfo.h"
#include "utils/datetime.h"

/* copied from timestamp.c */
pg_time_t

+ 1
- 2
src/bin/pg_waldump/pg_waldump.c View File

@@ -16,16 +16,15 @@
#include <sys/stat.h>
#include <unistd.h>

#include "access/xlog_internal.h"
#include "access/xlogreader.h"
#include "access/xlogrecord.h"
#include "access/xlog_internal.h"
#include "access/transam.h"
#include "common/fe_memutils.h"
#include "common/logging.h"
#include "getopt_long.h"
#include "rmgrdesc.h"


static const char *progname;

static int WalSegSz;

+ 8
- 7
src/bin/pgbench/pgbench.c View File

@@ -32,12 +32,6 @@
#endif

#include "postgres_fe.h"
#include "common/int.h"
#include "common/logging.h"
#include "fe_utils/conditional.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "portability/instr_time.h"

#include <ctype.h>
#include <float.h>
@@ -63,11 +57,18 @@
#endif
#endif

#include "common/int.h"
#include "common/logging.h"
#include "fe_utils/conditional.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#include "pgbench.h"
#include "portability/instr_time.h"

#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif

#include "pgbench.h"

#define ERRCODE_UNDEFINED_TABLE "42P01"


+ 4
- 6
src/bin/psql/common.c View File

@@ -18,18 +18,16 @@
#include <win32.h>
#endif

#include "common/logging.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/string_utils.h"
#include "portability/instr_time.h"

#include "command.h"
#include "common.h"
#include "common/logging.h"
#include "copy.h"
#include "crosstabview.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/string_utils.h"
#include "portability/instr_time.h"
#include "settings.h"


static bool DescribeQuery(const char *query, double *elapsed_msec);
static bool ExecQueryUsingCursor(const char *query, double *elapsed_msec);
static bool command_no_begin(const char *query);

+ 4
- 6
src/bin/psql/copy.c View File

@@ -6,7 +6,6 @@
* src/bin/psql/copy.c
*/
#include "postgres_fe.h"
#include "copy.h"

#include <signal.h>
#include <sys/stat.h>
@@ -16,16 +15,15 @@
#include <io.h> /* I think */
#endif

#include "common.h"
#include "common/logging.h"
#include "copy.h"
#include "libpq-fe.h"
#include "pqexpbuffer.h"

#include "settings.h"
#include "common.h"
#include "prompt.h"
#include "settings.h"
#include "stringutils.h"

#include "common/logging.h"

/*
* parse_slash_copy
* -- parses \copy command line

+ 1
- 2
src/bin/psql/crosstabview.c View File

@@ -8,13 +8,12 @@
#include "postgres_fe.h"

#include "common.h"
#include "common/logging.h"
#include "crosstabview.h"
#include "pqexpbuffer.h"
#include "psqlscanslash.h"
#include "settings.h"

#include "common/logging.h"

/*
* Value/position from the resultset that goes into the horizontal or vertical
* crosstabview header.

+ 2
- 5
src/bin/psql/describe.c View File

@@ -18,18 +18,15 @@
#include "catalog/pg_cast_d.h"
#include "catalog/pg_class_d.h"
#include "catalog/pg_default_acl_d.h"
#include "common.h"
#include "common/logging.h"
#include "describe.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/print.h"
#include "fe_utils/string_utils.h"

#include "common.h"
#include "describe.h"
#include "settings.h"
#include "variables.h"


static bool describeOneTableDetails(const char *schemaname,
const char *relationname,
const char *oid,

+ 1
- 2
src/bin/psql/help.c View File

@@ -21,10 +21,9 @@
#include <termios.h>
#endif

#include "common.h"
#include "common/logging.h"
#include "common/username.h"

#include "common.h"
#include "help.h"
#include "input.h"
#include "settings.h"

+ 2
- 3
src/bin/psql/input.c View File

@@ -13,12 +13,11 @@
#include <fcntl.h>
#include <limits.h>

#include "common.h"
#include "common/logging.h"
#include "input.h"
#include "settings.h"
#include "tab-complete.h"
#include "common.h"

#include "common/logging.h"

#ifndef WIN32
#define PSQLHISTORY ".psql_history"

+ 2
- 3
src/bin/psql/large_obj.c View File

@@ -6,12 +6,11 @@
* src/bin/psql/large_obj.c
*/
#include "postgres_fe.h"
#include "large_obj.h"

#include "settings.h"
#include "common.h"

#include "common/logging.h"
#include "large_obj.h"
#include "settings.h"

static void print_lo_result(const char *fmt,...) pg_attribute_printf(1, 2);


+ 3
- 5
src/bin/psql/mainloop.c View File

@@ -6,18 +6,16 @@
* src/bin/psql/mainloop.c
*/
#include "postgres_fe.h"
#include "mainloop.h"

#include "command.h"
#include "common.h"
#include "common/logging.h"
#include "input.h"
#include "mainloop.h"
#include "mb/pg_wchar.h"
#include "prompt.h"
#include "settings.h"

#include "common/logging.h"
#include "mb/pg_wchar.h"


/* callback functions for our flex lexer */
const PsqlScanCallbacks psqlscan_callbacks = {
psql_get_variable,

+ 1
- 2
src/bin/psql/prompt.c View File

@@ -18,12 +18,11 @@
#endif

#include "common.h"
#include "common/string.h"
#include "input.h"
#include "prompt.h"
#include "settings.h"

#include "common/string.h"

/*--------------------------
* get_prompt
*

+ 3
- 7
src/bin/psql/startup.c View File

@@ -14,21 +14,17 @@
#include <win32.h>
#endif /* WIN32 */

#include "getopt_long.h"

#include "common/logging.h"
#include "fe_utils/print.h"

#include "command.h"
#include "common.h"
#include "common/logging.h"
#include "describe.h"
#include "fe_utils/print.h"
#include "getopt_long.h"
#include "help.h"
#include "input.h"
#include "mainloop.h"
#include "settings.h"



/*
* Global psql options
*/

+ 1
- 3
src/bin/psql/variables.c View File

@@ -8,10 +8,8 @@
#include "postgres_fe.h"

#include "common.h"
#include "variables.h"

#include "common/logging.h"
#include "variables.h"

/*
* Check whether a variable's name is allowed.

+ 1
- 2
src/common/f2s.c View File

@@ -39,9 +39,8 @@
#endif

#include "common/shortest_dec.h"

#include "ryu_common.h"
#include "digit_table.h"
#include "ryu_common.h"

#define FLOAT_MANTISSA_BITS 23
#define FLOAT_EXPONENT_BITS 8

+ 1
- 3
src/fe_utils/print.c View File

@@ -30,11 +30,9 @@
#include <termios.h>
#endif

#include "fe_utils/print.h"

#include "catalog/pg_type_d.h"
#include "fe_utils/mbprint.h"
#include "fe_utils/print.h"

/*
* If the calling program doesn't have any mechanism for setting

+ 1
- 2
src/fe_utils/recovery_gen.c View File

@@ -10,9 +10,8 @@
#include "postgres_fe.h"

#include "common/logging.h"
#include "fe_utils/string_utils.h"
#include "fe_utils/recovery_gen.h"
#include "fe_utils/string_utils.h"

static char *escape_quotes(const char *src);


+ 1
- 3
src/fe_utils/string_utils.c View File

@@ -17,10 +17,8 @@

#include <ctype.h>

#include "fe_utils/string_utils.h"

#include "common/keywords.h"
#include "fe_utils/string_utils.h"

static PQExpBuffer defaultGetLocalPQExpBuffer(void);


+ 8
- 8
src/interfaces/ecpg/compatlib/informix.c View File

@@ -7,14 +7,14 @@
#include <ctype.h>
#include <limits.h>

#include <ecpgtype.h>
#include <ecpg_informix.h>
#include <pgtypes_error.h>
#include <pgtypes_date.h>
#include <pgtypes_numeric.h>
#include <sqltypes.h>
#include <sqlca.h>
#include <ecpgerrno.h>
#include "ecpg_informix.h"
#include "ecpgerrno.h"
#include "ecpgtype.h"
#include "pgtypes_date.h"
#include "pgtypes_error.h"
#include "pgtypes_numeric.h"
#include "sqlca.h"
#include "sqltypes.h"

/* this is also defined in ecpglib/misc.c, by defining it twice we don't have to export the symbol */


+ 2
- 2
src/interfaces/ecpg/ecpglib/connect.c View File

@@ -4,10 +4,10 @@
#include "postgres_fe.h"

#include "ecpg-pthread-win32.h"
#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpgerrno.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "ecpgtype.h"
#include "sqlca.h"

#ifdef ENABLE_THREAD_SAFETY

+ 5
- 5
src/interfaces/ecpg/ecpglib/data.c View File

@@ -5,15 +5,15 @@

#include <math.h>

#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpgerrno.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "sqlca.h"
#include "pgtypes_numeric.h"
#include "ecpgtype.h"
#include "pgtypes_date.h"
#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
#include "pgtypes_numeric.h"
#include "pgtypes_timestamp.h"
#include "sqlca.h"

/* returns true if character c is a delimiter for the given array type */
static bool

+ 2
- 3
src/interfaces/ecpg/ecpglib/descriptor.c View File

@@ -7,12 +7,11 @@
#include "postgres_fe.h"

#include "catalog/pg_type_d.h"

#include "ecpg-pthread-win32.h"
#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpgerrno.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "ecpgtype.h"
#include "sqlca.h"
#include "sqlda.h"
#include "sql3types.h"

+ 1
- 1
src/interfaces/ecpg/ecpglib/error.c View File

@@ -4,9 +4,9 @@
#include "postgres_fe.h"

#include "ecpgerrno.h"
#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "ecpgtype.h"
#include "sqlca.h"

void

+ 8
- 9
src/interfaces/ecpg/ecpglib/execute.c View File

@@ -19,19 +19,18 @@
#include <math.h>

#include "catalog/pg_type_d.h"

#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpgerrno.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "sqlca.h"
#include "sqlda-native.h"
#include "sqlda-compat.h"
#include "sql3types.h"
#include "pgtypes_numeric.h"
#include "ecpgtype.h"
#include "pgtypes_date.h"
#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
#include "pgtypes_numeric.h"
#include "pgtypes_timestamp.h"
#include "sql3types.h"
#include "sqlca.h"
#include "sqlda-compat.h"
#include "sqlda-native.h"

/*
* This function returns a newly malloced string that has ' and \

+ 2
- 2
src/interfaces/ecpg/ecpglib/memory.c View File

@@ -4,10 +4,10 @@
#include "postgres_fe.h"

#include "ecpg-pthread-win32.h"
#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpgerrno.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "ecpgtype.h"

void
ecpg_free(void *ptr)

+ 6
- 5
src/interfaces/ecpg/ecpglib/misc.c View File

@@ -5,17 +5,18 @@

#include <limits.h>
#include <unistd.h>

#include "ecpg-pthread-win32.h"
#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpgerrno.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "sqlca.h"
#include "pgtypes_numeric.h"
#include "ecpgtype.h"
#include "pgtypes_date.h"
#include "pgtypes_timestamp.h"
#include "pgtypes_interval.h"
#include "pgtypes_numeric.h"
#include "pgtypes_timestamp.h"
#include "pg_config_paths.h"
#include "sqlca.h"

#ifdef HAVE_LONG_LONG_INT
#ifndef LONG_LONG_MIN

+ 2
- 2
src/interfaces/ecpg/ecpglib/prepare.c View File

@@ -5,10 +5,10 @@

#include <ctype.h>

#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpgerrno.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "ecpgtype.h"
#include "sqlca.h"

#define STMTID_SIZE 32

+ 4
- 5
src/interfaces/ecpg/ecpglib/sqlda.c View File

@@ -10,16 +10,15 @@
#include "postgres_fe.h"

#include "catalog/pg_type_d.h"

#include "ecpg-pthread-win32.h"
#include "decimal.h"
#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpg-pthread-win32.h"
#include "ecpgerrno.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "ecpgtype.h"
#include "sqlca.h"
#include "sqlda-native.h"
#include "sqlda-compat.h"
#include "sqlda-native.h"

/*
* Compute the next variable's offset with

+ 2
- 3
src/interfaces/ecpg/ecpglib/typename.c View File

@@ -4,12 +4,11 @@
#include "postgres_fe.h"

#include "catalog/pg_type_d.h"

#include "ecpgtype.h"
#include "ecpglib.h"
#include "ecpglib_extern.h"
#include "sqltypes.h"
#include "ecpgtype.h"
#include "sql3types.h"
#include "sqltypes.h"

/*
* This function is used to generate the correct type names.

+ 1
- 1
src/interfaces/ecpg/pgtypeslib/common.c View File

@@ -2,8 +2,8 @@

#include "postgres_fe.h"

#include "pgtypeslib_extern.h"
#include "pgtypes.h"
#include "pgtypeslib_extern.h"

/* Return value is zero-filled. */
char *

+ 2
- 2
src/interfaces/ecpg/pgtypeslib/datetime.c View File

@@ -6,10 +6,10 @@
#include <ctype.h>
#include <limits.h>

#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_error.h"
#include "pgtypes_date.h"
#include "pgtypes_error.h"
#include "pgtypeslib_extern.h"

date *
PGTYPESdate_new(void)

+ 1
- 1
src/interfaces/ecpg/pgtypeslib/dt_common.c View File

@@ -7,9 +7,9 @@
#include <math.h>

#include "common/string.h"
#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_timestamp.h"
#include "pgtypeslib_extern.h"

const int day_tab[2][13] = {
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0},

+ 2
- 2
src/interfaces/ecpg/pgtypeslib/interval.c View File

@@ -1,6 +1,7 @@
/* src/interfaces/ecpg/pgtypeslib/interval.c */

#include "postgres_fe.h"

#include <time.h>
#include <math.h>
#include <limits.h>
@@ -10,11 +11,10 @@
#endif

#include "common/string.h"

#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_error.h"
#include "pgtypes_interval.h"
#include "pgtypeslib_extern.h"

/* copy&pasted from .../src/backend/utils/adt/datetime.c
* and changesd struct pg_tm to struct tm

+ 3
- 2
src/interfaces/ecpg/pgtypeslib/numeric.c View File

@@ -1,12 +1,14 @@
/* src/interfaces/ecpg/pgtypeslib/numeric.c */

#include "postgres_fe.h"

#include <ctype.h>
#include <float.h>
#include <limits.h>

#include "pgtypeslib_extern.h"
#include "pgtypes_error.h"
#include "pgtypes_numeric.h"
#include "pgtypeslib_extern.h"

#define Max(x, y) ((x) > (y) ? (x) : (y))
#define Min(x, y) ((x) < (y) ? (x) : (y))
@@ -20,7 +22,6 @@
free(buf); \
} while (0)

#include "pgtypes_numeric.h"

#if 0
/* ----------

+ 2
- 3
src/interfaces/ecpg/pgtypeslib/timestamp.c View File

@@ -11,11 +11,10 @@
#error -ffast-math is known to break this code
#endif

#include "pgtypeslib_extern.h"
#include "dt.h"
#include "pgtypes_timestamp.h"
#include "pgtypes_date.h"

#include "pgtypes_timestamp.h"
#include "pgtypeslib_extern.h"

static int64
time2t(const int hour, const int min, const int sec, const fsec_t fsec)

+ 2
- 3
src/interfaces/ecpg/preproc/c_keywords.c View File

@@ -9,11 +9,10 @@
*/
#include "postgres_fe.h"

#include "preproc_extern.h"
#include "preproc.h"

/* ScanKeywordList lookup data for C keywords */
#include "c_kwlist_d.h"
#include "preproc_extern.h"
#include "preproc.h"

/* Token codes for C keywords */
#define PG_KEYWORD(kwname, value) value,

+ 2
- 3
src/interfaces/ecpg/preproc/ecpg_keywords.c View File

@@ -13,11 +13,10 @@

#include <ctype.h>

#include "preproc_extern.h"
#include "preproc.h"

/* ScanKeywordList lookup data for ECPG keywords */
#include "ecpg_kwlist_d.h"
#include "preproc_extern.h"
#include "preproc.h"

/* Token codes for ECPG keywords */
#define PG_KEYWORD(kwname, value) value,

+ 1
- 2
src/interfaces/libpq/fe-auth.c View File

@@ -40,9 +40,8 @@

#include "common/md5.h"
#include "common/scram-common.h"
#include "libpq-fe.h"
#include "fe-auth.h"
#include "libpq-fe.h"

#ifdef ENABLE_GSS
/*

+ 7
- 9
src/interfaces/libpq/fe-connect.c View File

@@ -21,10 +21,16 @@
#include <time.h>
#include <unistd.h>

#include "common/ip.h"
#include "common/link-canary.h"
#include "common/scram-common.h"
#include "common/string.h"
#include "fe-auth.h"
#include "libpq-fe.h"
#include "libpq-int.h"
#include "fe-auth.h"
#include "mb/pg_wchar.h"
#include "pg_config_paths.h"
#include "port/pg_bswap.h"

#ifdef WIN32
#include "win32.h"
@@ -70,14 +76,6 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
PQExpBuffer errorMessage);
#endif

#include "common/ip.h"
#include "common/link-canary.h"
#include "common/scram-common.h"
#include "common/string.h"
#include "mb/pg_wchar.h"
#include "port/pg_bswap.h"


#ifndef WIN32
#define PGPASSFILE ".pgpass"
#else

+ 4
- 5
src/interfaces/libpq/fe-exec.c View File

@@ -18,17 +18,16 @@
#include <fcntl.h>
#include <limits.h>

#include "libpq-fe.h"
#include "libpq-int.h"

#include "mb/pg_wchar.h"

#ifdef WIN32
#include "win32.h"
#else
#include <unistd.h>
#endif

#include "libpq-fe.h"
#include "libpq-int.h"
#include "mb/pg_wchar.h"

/* keep this in same order as ExecStatusType in libpq-fe.h */
char *const pgresStatus[] = {
"PGRES_EMPTY_QUERY",

+ 1
- 2
src/interfaces/libpq/fe-misc.c View File

@@ -50,9 +50,8 @@
#include "libpq-fe.h"
#include "libpq-int.h"
#include "mb/pg_wchar.h"
#include "port/pg_bswap.h"
#include "pg_config_paths.h"
#include "port/pg_bswap.h"

static int pqPutMsgBytes(const void *buf, size_t len, PGconn *conn);
static int pqSendSome(PGconn *conn, int len);

+ 3
- 5
src/interfaces/libpq/fe-protocol2.c View File

@@ -17,11 +17,6 @@
#include <ctype.h>
#include <fcntl.h>

#include "libpq-fe.h"
#include "libpq-int.h"
#include "port/pg_bswap.h"


#ifdef WIN32
#include "win32.h"
#else
@@ -31,6 +26,9 @@
#endif
#endif

#include "libpq-fe.h"
#include "libpq-int.h"
#include "port/pg_bswap.h"

static int getRowDescriptions(PGconn *conn);
static int getAnotherTuple(PGconn *conn, bool binary);

+ 4
- 6
src/interfaces/libpq/fe-protocol3.c View File

@@ -17,12 +17,6 @@
#include <ctype.h>
#include <fcntl.h>

#include "libpq-fe.h"
#include "libpq-int.h"

#include "mb/pg_wchar.h"
#include "port/pg_bswap.h"

#ifdef WIN32
#include "win32.h"
#else
@@ -32,6 +26,10 @@
#endif
#endif

#include "libpq-fe.h"
#include "libpq-int.h"
#include "mb/pg_wchar.h"
#include "port/pg_bswap.h"

/*
* This macro lists the backend message types that could be "long" (more

+ 1
- 1
src/interfaces/libpq/fe-secure-gssapi.c View File

@@ -13,9 +13,9 @@

#include "postgres_fe.h"

#include "fe-gssapi-common.h"
#include "libpq-fe.h"
#include "libpq-int.h"
#include "fe-gssapi-common.h"
#include "port/pg_bswap.h"

/*

+ 4
- 4
src/interfaces/libpq/fe-secure.c View File

@@ -28,10 +28,6 @@
#include <fcntl.h>
#include <ctype.h>

#include "libpq-fe.h"
#include "fe-auth.h"
#include "libpq-int.h"

#ifdef WIN32
#include "win32.h"
#else
@@ -55,6 +51,10 @@
#endif
#endif

#include "fe-auth.h"
#include "libpq-fe.h"
#include "libpq-int.h"

/*
* Macros to handle disabling and then restoring the state of SIGPIPE handling.
* On Windows, these are all no-ops since there's no SIGPIPEs.

+ 1
- 3
src/pl/plpgsql/src/pl_comp.c View File

@@ -24,6 +24,7 @@
#include "funcapi.h"
#include "nodes/makefuncs.h"
#include "parser/parse_type.h"
#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
@@ -33,9 +34,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"

#include "plpgsql.h"


/* ----------
* Our own local and global variables
* ----------

+ 1
- 3
src/pl/plpgsql/src/pl_exec.c View File

@@ -34,6 +34,7 @@
#include "parser/parse_coerce.h"
#include "parser/parse_type.h"
#include "parser/scansup.h"
#include "plpgsql.h"
#include "storage/proc.h"
#include "tcop/tcopprot.h"
#include "tcop/utility.h"
@@ -48,9 +49,6 @@
#include "utils/syscache.h"
#include "utils/typcache.h"

#include "plpgsql.h"


typedef struct
{
int nargs; /* number of arguments */

+ 1
- 3
src/pl/plpgsql/src/pl_funcs.c View File

@@ -15,10 +15,8 @@

#include "postgres.h"

#include "utils/memutils.h"

#include "plpgsql.h"
#include "utils/memutils.h"

/* ----------
* Local variables for namespace handling

+ 1
- 3
src/pl/plpgsql/src/pl_handler.c View File

@@ -20,15 +20,13 @@
#include "catalog/pg_type.h"
#include "funcapi.h"
#include "miscadmin.h"
#include "plpgsql.h"
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/varlena.h"

#include "plpgsql.h"


static bool plpgsql_extra_checks_check_hook(char **newvalue, void **extra, GucSource source);
static void plpgsql_extra_warnings_assign_hook(const char *newvalue, void *extra);
static void plpgsql_extra_errors_assign_hook(const char *newvalue, void *extra);

+ 2
- 2
src/port/pg_crc32c_armv8.c View File

@@ -14,10 +14,10 @@
*/
#include "c.h"

#include "port/pg_crc32c.h"

#include <arm_acle.h>

#include "port/pg_crc32c.h"

pg_crc32c
pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t len)
{

+ 2
- 2
src/port/pg_crc32c_sse42.c View File

@@ -14,10 +14,10 @@
*/
#include "c.h"

#include "port/pg_crc32c.h"

#include <nmmintrin.h>

#include "port/pg_crc32c.h"

pg_crc32c
pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len)
{

+ 3
- 1
src/port/tar.c View File

@@ -1,7 +1,9 @@
#include "c.h"
#include "pgtar.h"
#include <sys/stat.h>

#include "pgtar.h"

/*
* Print a numeric field in a tar header. The field starts at *s and is of
* length len; val is the value to be written.

+ 2
- 3
src/test/isolation/isolationtester.c View File

@@ -13,11 +13,10 @@
#endif

#include "datatype/timestamp.h"
#include "isolationtester.h"
#include "libpq-fe.h"
#include "pqexpbuffer.h"
#include "pg_getopt.h"

#include "isolationtester.h"
#include "pqexpbuffer.h"

#define PREP_WAITING "isolationtester_waiting"


+ 1
- 1
src/test/modules/test_ginpostinglist/test_ginpostinglist.c View File

@@ -12,10 +12,10 @@
*/
#include "postgres.h"

#include "fmgr.h"
#include "access/ginblock.h"
#include "access/gin_private.h"
#include "access/htup_details.h"
#include "fmgr.h"

PG_MODULE_MAGIC;


+ 3
- 3
src/test/modules/test_integerset/test_integerset.c View File

@@ -14,12 +14,12 @@

#include "fmgr.h"
#include "lib/integerset.h"
#include "miscadmin.h"
#include "nodes/bitmapset.h"
#include "utils/memutils.h"
#include "utils/timestamp.h"
#include "storage/block.h"
#include "storage/itemptr.h"
#include "miscadmin.h"
#include "utils/memutils.h"
#include "utils/timestamp.h"

/*
* If you enable this, the "pattern" tests will print information about

+ 2
- 5
src/test/modules/test_rls_hooks/test_rls_hooks.c View File

@@ -13,19 +13,16 @@

#include "postgres.h"

#include "catalog/pg_type.h"
#include "fmgr.h"
#include "miscadmin.h"

#include "test_rls_hooks.h"

#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
#include "nodes/makefuncs.h"
#include "parser/parse_clause.h"
#include "parser/parse_collate.h"
#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "rewrite/rowsecurity.h"
#include "test_rls_hooks.h"
#include "utils/acl.h"
#include "utils/rel.h"
#include "utils/relcache.h"

+ 1
- 2
src/test/modules/test_shm_mq/setup.c View File

@@ -20,9 +20,8 @@
#include "postmaster/bgworker.h"
#include "storage/procsignal.h"
#include "storage/shm_toc.h"
#include "utils/memutils.h"

#include "test_shm_mq.h"
#include "utils/memutils.h"

typedef struct
{

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save