Mark a few 'bbsink' related functions / variables static.

Discussion: https://postgr.es/m/20220506234924.6mxxotl3xl63db3l@alap3.anarazel.de

diff --git a/contrib/basebackup_to_shell/basebackup_to_shell.c b/contrib/basebackup_to_shell/basebackup_to_shell.c
index fd462a8ff4de0f2e67f142640764fc1cbbeab28f..a279219966d49ec923bfd4247e74313791c1809d 100644 (file)
--- 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 de7875552cef5f86e9903e1d0f20e81110d7e780..90daeff09ce8289207af962dc7f3b0452981348b 100644 (file)
--- 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 5ae7451187b57e6118c684308be55a45f72c97bd..44f28ceba453477792f6d4304303b3aefe05bc1f 100644 (file)
--- 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 e06efddee08a278e7afdc66ba926a863e4e40907..65e774eff62a7405317ad4c89ab1623f4463adc8 100644 (file)
--- 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 05660a626b0e29c4fbf456387de1f940b7513f3a..36671ad3fda378795ea951e705b92a8e25bceece 100644 (file)
--- 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 f5d73301d8219dd419400cfd17c07ce27483f2fd..54e6829d2beb63ca47dccb588e541f5d7fa58ee9 100644 (file)
--- 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 35202576ae1c4b540f22f81f4e4960a610ed3184..243a2bacfef5484a36515393c339bdee74156100 100644 (file)
--- 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 37d9129e243007f579e667023fad08d81b75375e..af0704c3acefe4f450a9c735da96557786d44283 100644 (file)
--- 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 acb32275bcc36f53a38dfc7f3d99d8a1349dd15e..d767b26f4e36faccd1b351d81ab363f002b3f6a6 100644 (file)
--- 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,