From b5f44225b833a2fd07b4a7c77e33ae0c37e6a7d6 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 12 May 2022 09:10:03 -0700 Subject: [PATCH] Mark a few 'bbsink' related functions / variables static. Discussion: https://postgr.es/m/20220506234924.6mxxotl3xl63db3l@alap3.anarazel.de --- contrib/basebackup_to_shell/basebackup_to_shell.c | 2 +- src/backend/replication/basebackup_copy.c | 2 +- src/backend/replication/basebackup_gzip.c | 2 +- src/backend/replication/basebackup_lz4.c | 2 +- src/backend/replication/basebackup_progress.c | 2 +- src/backend/replication/basebackup_server.c | 2 +- src/backend/replication/basebackup_target.c | 12 ++++++------ src/backend/replication/basebackup_throttle.c | 2 +- src/backend/replication/basebackup_zstd.c | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/basebackup_to_shell/basebackup_to_shell.c b/contrib/basebackup_to_shell/basebackup_to_shell.c index fd462a8ff4d..a279219966d 100644 --- a/contrib/basebackup_to_shell/basebackup_to_shell.c +++ b/contrib/basebackup_to_shell/basebackup_to_shell.c @@ -50,7 +50,7 @@ static void bbsink_shell_begin_manifest(bbsink *sink); static void bbsink_shell_manifest_contents(bbsink *sink, size_t len); static void bbsink_shell_end_manifest(bbsink *sink); -const bbsink_ops bbsink_shell_ops = { +static const bbsink_ops bbsink_shell_ops = { .begin_backup = bbsink_forward_begin_backup, .begin_archive = bbsink_shell_begin_archive, .archive_contents = bbsink_shell_archive_contents, diff --git a/src/backend/replication/basebackup_copy.c b/src/backend/replication/basebackup_copy.c index de7875552ce..90daeff09ce 100644 --- a/src/backend/replication/basebackup_copy.c +++ b/src/backend/replication/basebackup_copy.c @@ -86,7 +86,7 @@ static void SendXlogRecPtrResult(XLogRecPtr ptr, TimeLineID tli); static void SendTablespaceList(List *tablespaces); static void send_int8_string(StringInfoData *buf, int64 intval); -const bbsink_ops bbsink_copystream_ops = { +static const bbsink_ops bbsink_copystream_ops = { .begin_backup = bbsink_copystream_begin_backup, .begin_archive = bbsink_copystream_begin_archive, .archive_contents = bbsink_copystream_archive_contents, diff --git a/src/backend/replication/basebackup_gzip.c b/src/backend/replication/basebackup_gzip.c index 5ae7451187b..44f28ceba45 100644 --- a/src/backend/replication/basebackup_gzip.c +++ b/src/backend/replication/basebackup_gzip.c @@ -42,7 +42,7 @@ static void bbsink_gzip_end_archive(bbsink *sink); static void *gzip_palloc(void *opaque, unsigned items, unsigned size); static void gzip_pfree(void *opaque, void *address); -const bbsink_ops bbsink_gzip_ops = { +static const bbsink_ops bbsink_gzip_ops = { .begin_backup = bbsink_gzip_begin_backup, .begin_archive = bbsink_gzip_begin_archive, .archive_contents = bbsink_gzip_archive_contents, diff --git a/src/backend/replication/basebackup_lz4.c b/src/backend/replication/basebackup_lz4.c index e06efddee08..65e774eff62 100644 --- a/src/backend/replication/basebackup_lz4.c +++ b/src/backend/replication/basebackup_lz4.c @@ -42,7 +42,7 @@ static void bbsink_lz4_manifest_contents(bbsink *sink, size_t len); static void bbsink_lz4_end_archive(bbsink *sink); static void bbsink_lz4_cleanup(bbsink *sink); -const bbsink_ops bbsink_lz4_ops = { +static const bbsink_ops bbsink_lz4_ops = { .begin_backup = bbsink_lz4_begin_backup, .begin_archive = bbsink_lz4_begin_archive, .archive_contents = bbsink_lz4_archive_contents, diff --git a/src/backend/replication/basebackup_progress.c b/src/backend/replication/basebackup_progress.c index 05660a626b0..36671ad3fda 100644 --- a/src/backend/replication/basebackup_progress.c +++ b/src/backend/replication/basebackup_progress.c @@ -43,7 +43,7 @@ static void bbsink_progress_begin_backup(bbsink *sink); static void bbsink_progress_archive_contents(bbsink *sink, size_t len); static void bbsink_progress_end_archive(bbsink *sink); -const bbsink_ops bbsink_progress_ops = { +static const bbsink_ops bbsink_progress_ops = { .begin_backup = bbsink_progress_begin_backup, .begin_archive = bbsink_forward_begin_archive, .archive_contents = bbsink_progress_archive_contents, diff --git a/src/backend/replication/basebackup_server.c b/src/backend/replication/basebackup_server.c index f5d73301d82..54e6829d2be 100644 --- a/src/backend/replication/basebackup_server.c +++ b/src/backend/replication/basebackup_server.c @@ -43,7 +43,7 @@ static void bbsink_server_begin_manifest(bbsink *sink); static void bbsink_server_manifest_contents(bbsink *sink, size_t len); static void bbsink_server_end_manifest(bbsink *sink); -const bbsink_ops bbsink_server_ops = { +static const bbsink_ops bbsink_server_ops = { .begin_backup = bbsink_forward_begin_backup, .begin_archive = bbsink_server_begin_archive, .archive_contents = bbsink_server_archive_contents, diff --git a/src/backend/replication/basebackup_target.c b/src/backend/replication/basebackup_target.c index 35202576ae1..243a2bacfef 100644 --- a/src/backend/replication/basebackup_target.c +++ b/src/backend/replication/basebackup_target.c @@ -32,8 +32,8 @@ struct BaseBackupTargetHandle }; static void initialize_target_list(void); -extern bbsink *blackhole_get_sink(bbsink *next_sink, void *detail_arg); -extern bbsink *server_get_sink(bbsink *next_sink, void *detail_arg); +static bbsink *blackhole_get_sink(bbsink *next_sink, void *detail_arg); +static bbsink *server_get_sink(bbsink *next_sink, void *detail_arg); static void *reject_target_detail(char *target, char *target_detail); static void *server_check_detail(char *target, char *target_detail); @@ -190,7 +190,7 @@ initialize_target_list(void) * but forward, but it's even cheaper to implement that by not adding a bbsink * at all. */ -bbsink * +static bbsink * blackhole_get_sink(bbsink *next_sink, void *detail_arg) { return next_sink; @@ -199,7 +199,7 @@ blackhole_get_sink(bbsink *next_sink, void *detail_arg) /* * Create a bbsink implementing a server-side backup. */ -bbsink * +static bbsink * server_get_sink(bbsink *next_sink, void *detail_arg) { return bbsink_server_new(next_sink, detail_arg); @@ -209,7 +209,7 @@ server_get_sink(bbsink *next_sink, void *detail_arg) * Implement target-detail checking for a target that does not accept a * detail. */ -void * +static void * reject_target_detail(char *target, char *target_detail) { if (target_detail != NULL) @@ -228,7 +228,7 @@ reject_target_detail(char *target, char *target_detail) * should be written, but we don't check that here. Rather, that check, * as well as the necessary permissions checking, happens in bbsink_server_new. */ -void * +static void * server_check_detail(char *target, char *target_detail) { if (target_detail == NULL) diff --git a/src/backend/replication/basebackup_throttle.c b/src/backend/replication/basebackup_throttle.c index 37d9129e243..af0704c3ace 100644 --- a/src/backend/replication/basebackup_throttle.c +++ b/src/backend/replication/basebackup_throttle.c @@ -43,7 +43,7 @@ static void bbsink_throttle_archive_contents(bbsink *sink, size_t len); static void bbsink_throttle_manifest_contents(bbsink *sink, size_t len); static void throttle(bbsink_throttle *sink, size_t increment); -const bbsink_ops bbsink_throttle_ops = { +static const bbsink_ops bbsink_throttle_ops = { .begin_backup = bbsink_throttle_begin_backup, .begin_archive = bbsink_forward_begin_archive, .archive_contents = bbsink_throttle_archive_contents, diff --git a/src/backend/replication/basebackup_zstd.c b/src/backend/replication/basebackup_zstd.c index acb32275bcc..d767b26f4e3 100644 --- a/src/backend/replication/basebackup_zstd.c +++ b/src/backend/replication/basebackup_zstd.c @@ -41,7 +41,7 @@ static void bbsink_zstd_cleanup(bbsink *sink); static void bbsink_zstd_end_backup(bbsink *sink, XLogRecPtr endptr, TimeLineID endtli); -const bbsink_ops bbsink_zstd_ops = { +static const bbsink_ops bbsink_zstd_ops = { .begin_backup = bbsink_zstd_begin_backup, .begin_archive = bbsink_zstd_begin_archive, .archive_contents = bbsink_zstd_archive_contents,