diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/access/transam/xlogrecovery.c | 3 | ||||
| -rw-r--r-- | src/backend/backup/basebackup_incremental.c | 6 | ||||
| -rw-r--r-- | src/backend/postmaster/autovacuum.c | 2 | ||||
| -rw-r--r-- | src/backend/postmaster/launch_backend.c | 2 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 2 | ||||
| -rw-r--r-- | src/backend/replication/logical/tablesync.c | 3 | ||||
| -rw-r--r-- | src/backend/replication/walsender.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/ri_triggers.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/fmgr/dfmgr.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/hash/dynahash.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/mmgr/slab.c | 2 |
11 files changed, 17 insertions, 19 deletions
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index a829a055a97..2c19013c98b 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -4778,8 +4778,7 @@ check_primary_slot_name(char **newval, void **extra, GucSource source) * that we have odd behaviors such as unexpected GUC ordering dependencies. */ -static void -pg_attribute_noreturn() +pg_noreturn static void error_multiple_recovery_targets(void) { ereport(ERROR, diff --git a/src/backend/backup/basebackup_incremental.c b/src/backend/backup/basebackup_incremental.c index c2b7a55e347..76a58068665 100644 --- a/src/backend/backup/basebackup_incremental.c +++ b/src/backend/backup/basebackup_incremental.c @@ -139,9 +139,9 @@ static void manifest_process_wal_range(JsonManifestParseContext *context, TimeLineID tli, XLogRecPtr start_lsn, XLogRecPtr end_lsn); -static void manifest_report_error(JsonManifestParseContext *context, - const char *fmt,...) - pg_attribute_printf(2, 3) pg_attribute_noreturn(); +pg_noreturn static void manifest_report_error(JsonManifestParseContext *context, + const char *fmt,...) + pg_attribute_printf(2, 3); static int compare_block_numbers(const void *a, const void *b); /* diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 800815dfbcc..71c34027c88 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -317,7 +317,7 @@ int AutovacuumLauncherPid = 0; static Oid do_start_worker(void); static void ProcessAutoVacLauncherInterrupts(void); -static void AutoVacLauncherShutdown(void) pg_attribute_noreturn(); +pg_noreturn static void AutoVacLauncherShutdown(void); static void launcher_determine_sleep(bool canlaunch, bool recursing, struct timeval *nap); static void launch_worker(TimestampTz now); diff --git a/src/backend/postmaster/launch_backend.c b/src/backend/postmaster/launch_backend.c index ecd04655c2a..77fb877dbad 100644 --- a/src/backend/postmaster/launch_backend.c +++ b/src/backend/postmaster/launch_backend.c @@ -171,7 +171,7 @@ static pid_t internal_forkexec(const char *child_kind, int child_slot, typedef struct { const char *name; - void (*main_fn) (const void *startup_data, size_t startup_data_len) pg_attribute_noreturn(); + void (*main_fn) (const void *startup_data, size_t startup_data_len); bool shmem_attach; } child_process_kind; diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 57155c00e01..d13846298bd 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -425,7 +425,7 @@ static void LogChildExit(int lev, const char *procname, static void PostmasterStateMachine(void); static void UpdatePMState(PMState newState); -static void ExitPostmaster(int status) pg_attribute_noreturn(); +pg_noreturn static void ExitPostmaster(int status); static int ServerLoop(void); static int BackendStartup(ClientSocket *client_sock); static void report_fork_failure_to_client(ClientSocket *client_sock, int errnum); diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c index 6af5c9fe16c..65b98aa905f 100644 --- a/src/backend/replication/logical/tablesync.c +++ b/src/backend/replication/logical/tablesync.c @@ -139,8 +139,7 @@ static StringInfo copybuf = NULL; /* * Exit routine for synchronization worker. */ -static void -pg_attribute_noreturn() +pg_noreturn static void finish_sync_worker(void) { /* diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 446d10c1a7d..d96121b3aad 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -237,7 +237,7 @@ typedef void (*WalSndSendDataCallback) (void); static void WalSndLoop(WalSndSendDataCallback send_data); static void InitWalSenderSlot(void); static void WalSndKill(int code, Datum arg); -static void WalSndShutdown(void) pg_attribute_noreturn(); +pg_noreturn static void WalSndShutdown(void); static void XLogSendPhysical(void); static void XLogSendLogical(void); static void WalSndDone(WalSndSendDataCallback send_data); diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 8473448849c..c4ff18ce65e 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -235,10 +235,10 @@ static bool ri_PerformCheck(const RI_ConstraintInfo *riinfo, static void ri_ExtractValues(Relation rel, TupleTableSlot *slot, const RI_ConstraintInfo *riinfo, bool rel_is_pk, Datum *vals, char *nulls); -static void ri_ReportViolation(const RI_ConstraintInfo *riinfo, - Relation pk_rel, Relation fk_rel, - TupleTableSlot *violatorslot, TupleDesc tupdesc, - int queryno, bool is_restrict, bool partgone) pg_attribute_noreturn(); +pg_noreturn static void ri_ReportViolation(const RI_ConstraintInfo *riinfo, + Relation pk_rel, Relation fk_rel, + TupleTableSlot *violatorslot, TupleDesc tupdesc, + int queryno, bool is_restrict, bool partgone); /* diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 87b233cb887..4409e3e6fa8 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -67,8 +67,8 @@ static DynamicFileList *file_tail = NULL; char *Dynamic_library_path; static void *internal_load_library(const char *libname); -static void incompatible_module_error(const char *libname, - const Pg_magic_struct *module_magic_data) pg_attribute_noreturn(); +pg_noreturn static void incompatible_module_error(const char *libname, + const Pg_magic_struct *module_magic_data); static char *expand_dynamic_library_name(const char *name); static void check_restricted_library_name(const char *name); static char *substitute_libpath_macro(const char *name); diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index cd5a00132fc..3f25929f2d8 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -272,7 +272,7 @@ static HASHBUCKET get_hash_entry(HTAB *hashp, int freelist_idx); static void hdefault(HTAB *hashp); static int choose_nelem_alloc(Size entrysize); static bool init_htab(HTAB *hashp, long nelem); -static void hash_corrupted(HTAB *hashp) pg_attribute_noreturn(); +pg_noreturn static void hash_corrupted(HTAB *hashp); static uint32 hash_initial_lookup(HTAB *hashp, uint32 hashvalue, HASHBUCKET **bucketptr); static long next_pow2_long(long num); diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c index ec8eddad863..d32c0d318fb 100644 --- a/src/backend/utils/mmgr/slab.c +++ b/src/backend/utils/mmgr/slab.c @@ -601,8 +601,8 @@ SlabAllocFromNewBlock(MemoryContext context, Size size, int flags) * want to avoid that. */ pg_noinline +pg_noreturn static void -pg_attribute_noreturn() SlabAllocInvalidSize(MemoryContext context, Size size) { SlabContext *slab = (SlabContext *) context; |