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

Applying indent style

Browse Source
This commit is contained in:
Cédric Villemain
2011-03-28 16:05:09 +02:00
parent d77186c904
commit e74e319e7a
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
check_dir.c
View File

@@ -129,10 +129,10 @@ mkdir_p(char *path, mode_t omode)
{ {
struct stat sb; struct stat sb;
mode_t numask, mode_t numask,
oumask; oumask;
int first, int first,
last, last,
retval; retval;
char *p; char *p;
p = path; p = path;

2
dbutils.h
View File

@@ -27,7 +27,7 @@ PGconn *establishDBConnectionByParams(const char *keywords[],
bool is_standby(PGconn *conn); bool is_standby(PGconn *conn);
char *pg_version(PGconn *conn, char* major_version); char *pg_version(PGconn *conn, char* major_version);
bool guc_setted(PGconn *conn, const char *parameter, const char *op, bool guc_setted(PGconn *conn, const char *parameter, const char *op,
const char *value); const char *value);
const char *get_cluster_size(PGconn *conn); const char *get_cluster_size(PGconn *conn);
PGconn *getMasterConnection(PGconn *standby_conn, int id, char *cluster, PGconn *getMasterConnection(PGconn *standby_conn, int id, char *cluster,
int *master_id, char *master_conninfo_out); int *master_id, char *master_conninfo_out);

16
repmgr.c
View File

@@ -49,7 +49,7 @@
static void help(const char *progname); static void help(const char *progname);
static bool create_recovery_file(const char *data_dir, char *master_conninfo); static bool create_recovery_file(const char *data_dir, char *master_conninfo);
static int copy_remote_files(char *host, char *remote_user, char *remote_path, static int copy_remote_files(char *host, char *remote_user, char *remote_path,
char *local_path, bool is_directory); char *local_path, bool is_directory);
static bool check_parameters_for_action(const int action); static bool check_parameters_for_action(const int action);
static void do_master_register(void); static void do_master_register(void);
@@ -1379,8 +1379,8 @@ create_recovery_file(const char *data_dir, char *master_conninfo)
return false; return false;
} }
maxlen_snprintf(line, "primary_conninfo = 'host=%s port=%s'\n", runtime_options.host, maxlen_snprintf(line, "primary_conninfo = 'host=%s port=%s'\n", runtime_options.host,
(runtime_options.masterport[0]) ? runtime_options.masterport : "5432"); (runtime_options.masterport[0]) ? runtime_options.masterport : "5432");
/* /*
* Template a password into the connection string in recovery.conf * Template a password into the connection string in recovery.conf
@@ -1400,8 +1400,8 @@ create_recovery_file(const char *data_dir, char *master_conninfo)
{ {
maxlen_snprintf(line, maxlen_snprintf(line,
"primary_conninfo = 'host=%s port=%s password=%s'\n", "primary_conninfo = 'host=%s port=%s password=%s'\n",
runtime_options.host, runtime_options.host,
(runtime_options.masterport[0]) ? runtime_options.masterport : "5432", (runtime_options.masterport[0]) ? runtime_options.masterport : "5432",
password); password);
} }
else else
@@ -1473,14 +1473,14 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
r = system(script); r = system(script);
/* /*
* If we are transfering a directory (ie: data directory, tablespace directories) * If we are transfering a directory (ie: data directory, tablespace directories)
* then we can ignore some rsync errors, so if we get some of those errors we * then we can ignore some rsync errors, so if we get some of those errors we
* treat them as 0 * treat them as 0
* List of ignorable rsync errors: * List of ignorable rsync errors:
* 24 Partial transfer due to vanished source files * 24 Partial transfer due to vanished source files
*/ */
if (is_directory && (r == 24)) if (is_directory && (r == 24))
r = 0; r = 0;
if (r != 0) if (r != 0)