diff options
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/pg_basebackup/bbstreamer.h | 2 | ||||
| -rw-r--r-- | src/bin/pg_basebackup/pg_basebackup.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_basebackup/walmethods.h | 2 | ||||
| -rw-r--r-- | src/bin/pg_checksums/pg_checksums.c | 2 | ||||
| -rw-r--r-- | src/bin/pg_ctl/pg_ctl.c | 6 | ||||
| -rw-r--r-- | src/bin/pg_dump/parallel.c | 2 | ||||
| -rw-r--r-- | src/bin/pg_dump/parallel.h | 2 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_backup.h | 8 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.h | 10 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 2 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dump.h | 2 | ||||
| -rw-r--r-- | src/bin/pg_rewind/filemap.h | 4 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/pg_upgrade.h | 4 | ||||
| -rw-r--r-- | src/bin/pg_verifybackup/parse_manifest.c | 6 | ||||
| -rw-r--r-- | src/bin/pgbench/pgbench.c | 10 | ||||
| -rw-r--r-- | src/bin/pgbench/pgbench.h | 6 | ||||
| -rw-r--r-- | src/bin/psql/command.c | 2 | ||||
| -rw-r--r-- | src/bin/psql/command.h | 2 | ||||
| -rw-r--r-- | src/bin/psql/psqlscanslash.h | 2 | ||||
| -rw-r--r-- | src/bin/psql/settings.h | 12 | ||||
| -rw-r--r-- | src/bin/psql/startup.c | 2 | ||||
| -rw-r--r-- | src/bin/scripts/reindexdb.c | 2 | ||||
| -rw-r--r-- | src/bin/scripts/vacuumdb.c | 2 |
23 files changed, 48 insertions, 48 deletions
diff --git a/src/bin/pg_basebackup/bbstreamer.h b/src/bin/pg_basebackup/bbstreamer.h index f999e635d98..c7dd92d4213 100644 --- a/src/bin/pg_basebackup/bbstreamer.h +++ b/src/bin/pg_basebackup/bbstreamer.h @@ -56,7 +56,7 @@ typedef enum BBSTREAMER_MEMBER_HEADER, BBSTREAMER_MEMBER_CONTENTS, BBSTREAMER_MEMBER_TRAILER, - BBSTREAMER_ARCHIVE_TRAILER + BBSTREAMER_ARCHIVE_TRAILER, } bbstreamer_archive_context; /* diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 1a8cef345dc..f32684a8f23 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -108,7 +108,7 @@ typedef enum { NO_WAL, FETCH_WAL, - STREAM_WAL + STREAM_WAL, } IncludeWal; /* @@ -118,7 +118,7 @@ typedef enum { COMPRESS_LOCATION_UNSPECIFIED, COMPRESS_LOCATION_CLIENT, - COMPRESS_LOCATION_SERVER + COMPRESS_LOCATION_SERVER, } CompressionLocation; /* Global options */ diff --git a/src/bin/pg_basebackup/walmethods.h b/src/bin/pg_basebackup/walmethods.h index 54a22fe6070..6be5ff534ea 100644 --- a/src/bin/pg_basebackup/walmethods.h +++ b/src/bin/pg_basebackup/walmethods.h @@ -32,7 +32,7 @@ typedef enum { CLOSE_NORMAL, CLOSE_UNLINK, - CLOSE_NO_RENAME + CLOSE_NO_RENAME, } WalCloseMethod; /* diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c index e009ba5e0bc..6543d9ce089 100644 --- a/src/bin/pg_checksums/pg_checksums.c +++ b/src/bin/pg_checksums/pg_checksums.c @@ -50,7 +50,7 @@ typedef enum { PG_MODE_CHECK, PG_MODE_DISABLE, - PG_MODE_ENABLE + PG_MODE_ENABLE, } PgChecksumMode; static PgChecksumMode mode = PG_MODE_CHECK; diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index 4099d240e03..3b145bd8381 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -38,14 +38,14 @@ typedef enum { SMART_MODE, FAST_MODE, - IMMEDIATE_MODE + IMMEDIATE_MODE, } ShutdownMode; typedef enum { POSTMASTER_READY, POSTMASTER_STILL_STARTING, - POSTMASTER_FAILED + POSTMASTER_FAILED, } WaitPMResult; typedef enum @@ -62,7 +62,7 @@ typedef enum KILL_COMMAND, REGISTER_COMMAND, UNREGISTER_COMMAND, - RUN_AS_SERVICE_COMMAND + RUN_AS_SERVICE_COMMAND, } CtlCommand; #define DEFAULT_WAIT 60 diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c index da0723ad385..85e6515ac21 100644 --- a/src/bin/pg_dump/parallel.c +++ b/src/bin/pg_dump/parallel.c @@ -77,7 +77,7 @@ typedef enum WRKR_NOT_STARTED = 0, WRKR_IDLE, WRKR_WORKING, - WRKR_TERMINATED + WRKR_TERMINATED, } T_WorkerStatus; #define WORKER_IS_RUNNING(workerStatus) \ diff --git a/src/bin/pg_dump/parallel.h b/src/bin/pg_dump/parallel.h index 17f03c1cceb..e26cf9833c8 100644 --- a/src/bin/pg_dump/parallel.h +++ b/src/bin/pg_dump/parallel.h @@ -32,7 +32,7 @@ typedef enum WFW_NO_WAIT, WFW_GOT_STATUS, WFW_ONE_IDLE, - WFW_ALL_IDLE + WFW_ALL_IDLE, } WFW_WaitOption; /* diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h index 3a57cdd97d4..9ef2f2017ef 100644 --- a/src/bin/pg_dump/pg_backup.h +++ b/src/bin/pg_dump/pg_backup.h @@ -33,7 +33,7 @@ typedef enum trivalue { TRI_DEFAULT, TRI_NO, - TRI_YES + TRI_YES, } trivalue; typedef enum _archiveFormat @@ -42,14 +42,14 @@ typedef enum _archiveFormat archCustom = 1, archTar = 3, archNull = 4, - archDirectory = 5 + archDirectory = 5, } ArchiveFormat; typedef enum _archiveMode { archModeAppend, archModeWrite, - archModeRead + archModeRead, } ArchiveMode; typedef enum _teSection @@ -57,7 +57,7 @@ typedef enum _teSection SECTION_NONE = 1, /* comments, ACLs, etc; can be anywhere */ SECTION_PRE_DATA, /* stuff to be processed before data */ SECTION_DATA, /* table data, large objects, LO comments */ - SECTION_POST_DATA /* stuff to be processed after data */ + SECTION_POST_DATA, /* stuff to be processed after data */ } teSection; /* We need one enum entry per prepared query in pg_dump */ diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h index b07673933d4..917283fd341 100644 --- a/src/bin/pg_dump/pg_backup_archiver.h +++ b/src/bin/pg_dump/pg_backup_archiver.h @@ -113,7 +113,7 @@ struct ParallelState; typedef enum T_Action { ACT_DUMP, - ACT_RESTORE + ACT_RESTORE, } T_Action; typedef void (*ClosePtrType) (ArchiveHandle *AH); @@ -151,7 +151,7 @@ typedef enum { SQL_SCAN = 0, /* normal */ SQL_IN_SINGLE_QUOTE, /* '...' literal */ - SQL_IN_DOUBLE_QUOTE /* "..." identifier */ + SQL_IN_DOUBLE_QUOTE, /* "..." identifier */ } sqlparseState; typedef struct @@ -166,14 +166,14 @@ typedef enum STAGE_NONE = 0, STAGE_INITIALIZING, STAGE_PROCESSING, - STAGE_FINALIZING + STAGE_FINALIZING, } ArchiverStage; typedef enum { OUTPUT_SQLCMDS = 0, /* emitting general SQL commands */ OUTPUT_COPYDATA, /* writing COPY data */ - OUTPUT_OTHERDATA /* writing data as INSERT commands */ + OUTPUT_OTHERDATA, /* writing data as INSERT commands */ } ArchiverOutput; /* @@ -199,7 +199,7 @@ typedef enum { RESTORE_PASS_MAIN = 0, /* Main pass (most TOC item types) */ RESTORE_PASS_ACL, /* ACL item types */ - RESTORE_PASS_POST_ACL /* Event trigger and matview refresh items */ + RESTORE_PASS_POST_ACL, /* Event trigger and matview refresh items */ #define RESTORE_PASS_LAST RESTORE_PASS_POST_ACL } RestorePass; diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 83aeef2751b..7afdbf4d9de 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -95,7 +95,7 @@ typedef enum OidOptions { zeroIsError = 1, zeroAsStar = 2, - zeroAsNone = 4 + zeroAsNone = 4, } OidOptions; /* global decls */ diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h index 9036b13f6a5..d8f27f187cb 100644 --- a/src/bin/pg_dump/pg_dump.h +++ b/src/bin/pg_dump/pg_dump.h @@ -82,7 +82,7 @@ typedef enum DO_PUBLICATION, DO_PUBLICATION_REL, DO_PUBLICATION_TABLE_IN_SCHEMA, - DO_SUBSCRIPTION + DO_SUBSCRIPTION, } DumpableObjectType; /* diff --git a/src/bin/pg_rewind/filemap.h b/src/bin/pg_rewind/filemap.h index 48f240dff12..988d4590e02 100644 --- a/src/bin/pg_rewind/filemap.h +++ b/src/bin/pg_rewind/filemap.h @@ -24,7 +24,7 @@ typedef enum FILE_ACTION_NONE, /* no action (we might still copy modified * blocks based on the parsed WAL) */ FILE_ACTION_TRUNCATE, /* truncate local file to 'newsize' bytes */ - FILE_ACTION_REMOVE /* remove local file / directory / symlink */ + FILE_ACTION_REMOVE, /* remove local file / directory / symlink */ } file_action_t; typedef enum @@ -33,7 +33,7 @@ typedef enum FILE_TYPE_REGULAR, FILE_TYPE_DIRECTORY, - FILE_TYPE_SYMLINK + FILE_TYPE_SYMLINK, } file_type_t; /* diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h index ba8129d1354..a710f325ded 100644 --- a/src/bin/pg_upgrade/pg_upgrade.h +++ b/src/bin/pg_upgrade/pg_upgrade.h @@ -253,7 +253,7 @@ typedef enum { TRANSFER_MODE_CLONE, TRANSFER_MODE_COPY, - TRANSFER_MODE_LINK + TRANSFER_MODE_LINK, } transferMode; /* @@ -266,7 +266,7 @@ typedef enum PG_REPORT_NONL, /* these too */ PG_REPORT, PG_WARNING, - PG_FATAL + PG_FATAL, } eLogType; diff --git a/src/bin/pg_verifybackup/parse_manifest.c b/src/bin/pg_verifybackup/parse_manifest.c index f0acd9f1e70..bf0227c6689 100644 --- a/src/bin/pg_verifybackup/parse_manifest.c +++ b/src/bin/pg_verifybackup/parse_manifest.c @@ -34,7 +34,7 @@ typedef enum JM_EXPECT_THIS_WAL_RANGE_FIELD, JM_EXPECT_THIS_WAL_RANGE_VALUE, JM_EXPECT_MANIFEST_CHECKSUM_VALUE, - JM_EXPECT_EOF + JM_EXPECT_EOF, } JsonManifestSemanticState; /* @@ -47,7 +47,7 @@ typedef enum JMFF_SIZE, JMFF_LAST_MODIFIED, JMFF_CHECKSUM_ALGORITHM, - JMFF_CHECKSUM + JMFF_CHECKSUM, } JsonManifestFileField; /* @@ -57,7 +57,7 @@ typedef enum { JMWRF_TIMELINE, JMWRF_START_LSN, - JMWRF_END_LSN + JMWRF_END_LSN, } JsonManifestWALRangeField; /* diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index e86c653cd22..2e1650d0ad3 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -227,7 +227,7 @@ typedef enum { PART_NONE, /* no partitioning */ PART_RANGE, /* range partitioning */ - PART_HASH /* hash partitioning */ + PART_HASH, /* hash partitioning */ } partition_method_t; static partition_method_t partition_method = PART_NONE; @@ -459,7 +459,7 @@ typedef enum EStatus /* SQL errors */ ESTATUS_SERIALIZATION_ERROR, ESTATUS_DEADLOCK_ERROR, - ESTATUS_OTHER_SQL_ERROR + ESTATUS_OTHER_SQL_ERROR, } EStatus; /* @@ -470,7 +470,7 @@ typedef enum TStatus TSTATUS_IDLE, TSTATUS_IN_BLOCK, TSTATUS_CONN_ERROR, - TSTATUS_OTHER_ERROR + TSTATUS_OTHER_ERROR, } TStatus; /* Various random sequences are initialized from this one. */ @@ -587,7 +587,7 @@ typedef enum * aborted because a command failed, CSTATE_FINISHED means success. */ CSTATE_ABORTED, - CSTATE_FINISHED + CSTATE_FINISHED, } ConnectionStateEnum; /* @@ -697,7 +697,7 @@ typedef enum MetaCommand META_ELSE, /* \else */ META_ENDIF, /* \endif */ META_STARTPIPELINE, /* \startpipeline */ - META_ENDPIPELINE /* \endpipeline */ + META_ENDPIPELINE, /* \endpipeline */ } MetaCommand; typedef enum QueryMode diff --git a/src/bin/pgbench/pgbench.h b/src/bin/pgbench/pgbench.h index f8efa4b868a..acaa54cd6f8 100644 --- a/src/bin/pgbench/pgbench.h +++ b/src/bin/pgbench/pgbench.h @@ -37,7 +37,7 @@ typedef enum PGBT_NULL, PGBT_INT, PGBT_DOUBLE, - PGBT_BOOLEAN + PGBT_BOOLEAN, /* add other types here */ } PgBenchValueType; @@ -58,7 +58,7 @@ typedef enum PgBenchExprType { ENODE_CONSTANT, ENODE_VARIABLE, - ENODE_FUNCTION + ENODE_FUNCTION, } PgBenchExprType; /* List of operators and callable functions */ @@ -100,7 +100,7 @@ typedef enum PgBenchFunction PGBENCH_CASE, PGBENCH_HASH_FNV1A, PGBENCH_HASH_MURMUR2, - PGBENCH_PERMUTE + PGBENCH_PERMUTE, } PgBenchFunction; typedef struct PgBenchExpr PgBenchExpr; diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 4dfcf04fe03..82cc0915685 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -53,7 +53,7 @@ typedef enum EditableObjectType { EditableFunction, - EditableView + EditableView, } EditableObjectType; /* local function declarations */ diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h index 9af85deeae1..b40fcaceb6f 100644 --- a/src/bin/psql/command.h +++ b/src/bin/psql/command.h @@ -19,7 +19,7 @@ typedef enum _backslashResult PSQL_CMD_SKIP_LINE, /* keep building query */ PSQL_CMD_TERMINATE, /* quit program */ PSQL_CMD_NEWEDIT, /* query buffer was changed (e.g., via \e) */ - PSQL_CMD_ERROR /* the execution of the backslash command + PSQL_CMD_ERROR, /* the execution of the backslash command * resulted in an error */ } backslashResult; diff --git a/src/bin/psql/psqlscanslash.h b/src/bin/psql/psqlscanslash.h index 7724242f371..c217f958f70 100644 --- a/src/bin/psql/psqlscanslash.h +++ b/src/bin/psql/psqlscanslash.h @@ -18,7 +18,7 @@ enum slash_option_type OT_SQLID, /* treat as SQL identifier */ OT_SQLIDHACK, /* SQL identifier, but don't downcase */ OT_FILEPIPE, /* it's a filename or pipe */ - OT_WHOLE_LINE /* just snarf the rest of the line */ + OT_WHOLE_LINE, /* just snarf the rest of the line */ }; diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h index 1106954236d..78e9e9692e5 100644 --- a/src/bin/psql/settings.h +++ b/src/bin/psql/settings.h @@ -37,21 +37,21 @@ typedef enum PSQL_ECHO_NONE, PSQL_ECHO_QUERIES, PSQL_ECHO_ERRORS, - PSQL_ECHO_ALL + PSQL_ECHO_ALL, } PSQL_ECHO; typedef enum { PSQL_ECHO_HIDDEN_OFF, PSQL_ECHO_HIDDEN_ON, - PSQL_ECHO_HIDDEN_NOEXEC + PSQL_ECHO_HIDDEN_NOEXEC, } PSQL_ECHO_HIDDEN; typedef enum { PSQL_ERROR_ROLLBACK_OFF, PSQL_ERROR_ROLLBACK_INTERACTIVE, - PSQL_ERROR_ROLLBACK_ON + PSQL_ERROR_ROLLBACK_ON, } PSQL_ERROR_ROLLBACK; typedef enum @@ -59,7 +59,7 @@ typedef enum PSQL_COMP_CASE_PRESERVE_UPPER, PSQL_COMP_CASE_PRESERVE_LOWER, PSQL_COMP_CASE_UPPER, - PSQL_COMP_CASE_LOWER + PSQL_COMP_CASE_LOWER, } PSQL_COMP_CASE; typedef enum @@ -67,14 +67,14 @@ typedef enum hctl_none = 0, hctl_ignorespace = 1, hctl_ignoredups = 2, - hctl_ignoreboth = hctl_ignorespace | hctl_ignoredups + hctl_ignoreboth = hctl_ignorespace | hctl_ignoredups, } HistControl; enum trivalue { TRI_DEFAULT, TRI_NO, - TRI_YES + TRI_YES, }; typedef struct _psqlSettings diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 5a28b6f7132..78526eb9dab 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -47,7 +47,7 @@ enum _actions { ACT_SINGLE_QUERY, ACT_SINGLE_SLASH, - ACT_FILE + ACT_FILE, }; typedef struct SimpleActionListCell diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c index 002c41f2219..ab7f190850c 100644 --- a/src/bin/scripts/reindexdb.c +++ b/src/bin/scripts/reindexdb.c @@ -30,7 +30,7 @@ typedef enum ReindexType REINDEX_INDEX, REINDEX_SCHEMA, REINDEX_SYSTEM, - REINDEX_TABLE + REINDEX_TABLE, } ReindexType; diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c index d682573dc17..dd0d51659b9 100644 --- a/src/bin/scripts/vacuumdb.c +++ b/src/bin/scripts/vacuumdb.c @@ -57,7 +57,7 @@ typedef enum OBJFILTER_DATABASE = (1 << 1), /* -d | --dbname */ OBJFILTER_TABLE = (1 << 2), /* -t | --table */ OBJFILTER_SCHEMA = (1 << 3), /* -n | --schema */ - OBJFILTER_SCHEMA_EXCLUDE = (1 << 4) /* -N | --exclude-schema */ + OBJFILTER_SCHEMA_EXCLUDE = (1 << 4), /* -N | --exclude-schema */ } VacObjFilter; VacObjFilter objfilter = OBJFILTER_NONE; |
