github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 16:16:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Use appendPQExpBufferStr where appropriate

Browse Source
This commit is contained in:
Ian Barwick
2019-08-13 16:31:55 +09:00
parent 5c1ca6cba5
commit 701fdd9622
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
repmgr-client.c
View File

@@ -3029,19 +3029,19 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
if (*config_file_options.rsync_options == '\0') if (*config_file_options.rsync_options == '\0')
{ {
appendPQExpBuffer(&rsync_flags, "%s", appendPQExpBufferStr(&rsync_flags,
"--archive --checksum --compress --progress --rsh=ssh"); "--archive --checksum --compress --progress --rsh=ssh");
} }
else else
{ {
appendPQExpBuffer(&rsync_flags, "%s", appendPQExpBufferStr(&rsync_flags,
config_file_options.rsync_options); config_file_options.rsync_options);
} }
if (runtime_options.force) if (runtime_options.force)
{ {
appendPQExpBuffer(&rsync_flags, "%s", appendPQExpBufferStr(&rsync_flags,
" --delete --checksum"); " --delete --checksum");
} }
if (!remote_user[0]) if (!remote_user[0])
@@ -3067,11 +3067,11 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
if (is_directory) if (is_directory)
{ {
/* Files which we don't want */ /* Files which we don't want */
appendPQExpBuffer(&rsync_flags, "%s", appendPQExpBufferStr(&rsync_flags,
" --exclude=postmaster.pid --exclude=postmaster.opts --exclude=global/pg_control"); " --exclude=postmaster.pid --exclude=postmaster.opts --exclude=global/pg_control");
appendPQExpBuffer(&rsync_flags, "%s", appendPQExpBufferStr(&rsync_flags,
" --exclude=recovery.conf --exclude=recovery.done"); " --exclude=recovery.conf --exclude=recovery.done");
if (server_version_num >= 90400) if (server_version_num >= 90400)
{ {
@@ -3079,8 +3079,8 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
* Ideally we'd use PG_AUTOCONF_FILENAME from utils/guc.h, but * Ideally we'd use PG_AUTOCONF_FILENAME from utils/guc.h, but
* that has too many dependencies for a mere client program. * that has too many dependencies for a mere client program.
*/ */
appendPQExpBuffer(&rsync_flags, "%s", appendPQExpBufferStr(&rsync_flags,
" --exclude=postgresql.auto.conf.tmp"); " --exclude=postgresql.auto.conf.tmp");
} }
/* Temporary files which we don't want, if they exist */ /* Temporary files which we don't want, if they exist */
@@ -3091,17 +3091,17 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
if (server_version_num >= 100000) if (server_version_num >= 100000)
{ {
appendPQExpBuffer(&rsync_flags, "%s", appendPQExpBufferStr(&rsync_flags,
" --exclude=pg_wal/*"); " --exclude=pg_wal/*");
} }
else else
{ {
appendPQExpBuffer(&rsync_flags, "%s", appendPQExpBufferStr(&rsync_flags,
" --exclude=pg_xlog/*"); " --exclude=pg_xlog/*");
} }
appendPQExpBuffer(&rsync_flags, "%s", appendPQExpBufferStr(&rsync_flags,
" --exclude=pg_log/* --exclude=pg_stat_tmp/*"); " --exclude=pg_log/* --exclude=pg_stat_tmp/*");
maxlen_snprintf(script, "rsync %s %s:%s/* %s", maxlen_snprintf(script, "rsync %s %s:%s/* %s",
rsync_flags.data, host_string, remote_path, local_path); rsync_flags.data, host_string, remote_path, local_path);