From 13e7c679cd5463e161e7aa055049bd1d92079dd8 Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Tue, 1 Sep 2020 13:35:13 +0900 Subject: [PATCH] Minor coding style fixes --- dbutils.c | 8 ++++++-- repmgr-action-node.c | 2 +- repmgr-client.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dbutils.c b/dbutils.c index 0cbae2d7..d41748c6 100644 --- a/dbutils.c +++ b/dbutils.c @@ -1830,7 +1830,7 @@ can_execute_pg_promote(PGconn *conn) bool has_pg_promote= false; /* pg_promote() available from PostgreSQL 12 */ - if(PQserverVersion(conn) < 120000) + if (PQserverVersion(conn) < 120000) return false; initPQExpBuffer(&query); @@ -1869,7 +1869,7 @@ connection_has_pg_settings(PGconn *conn) has_pg_settings = true; } /* from PostgreSQL 10, a non-superuser may have been granted access */ - else if(PQserverVersion(conn) >= 100000) + else if (PQserverVersion(conn) >= 100000) { PQExpBufferData query; PGresult *res; @@ -5823,6 +5823,10 @@ is_downstream_node_attached(PGconn *conn, char *node_name, char **node_state) return NODE_DETACHED; } + /* + * If the connec + */ + state = PQgetvalue(res, 0, 1); if (node_state != NULL) diff --git a/repmgr-action-node.c b/repmgr-action-node.c index 406fd75d..2e8ec06e 100644 --- a/repmgr-action-node.c +++ b/repmgr-action-node.c @@ -2834,7 +2834,7 @@ do_node_rejoin(void) struct stat statbuf; PQExpBufferData slotdir_ent_path; - if(strcmp(slotdir_ent->d_name, ".") == 0 || strcmp(slotdir_ent->d_name, "..") == 0) + if (strcmp(slotdir_ent->d_name, ".") == 0 || strcmp(slotdir_ent->d_name, "..") == 0) continue; initPQExpBuffer(&slotdir_ent_path); diff --git a/repmgr-client.c b/repmgr-client.c index 532917b5..cd8e8714 100644 --- a/repmgr-client.c +++ b/repmgr-client.c @@ -2293,7 +2293,7 @@ format_node_status(t_node_info *node_info, PQExpBufferData *node_status, PQExpBu node_info->node_id); } /* mismatch between reported upstream and upstream in local node's metadata */ - else if(node_info->upstream_node_id != remote_node_rec.upstream_node_id) + else if (node_info->upstream_node_id != remote_node_rec.upstream_node_id) { appendPQExpBufferStr(upstream, "! ");