c-style: More consistent brace usage

Use more braces in places where statement boundaries are
not obvious at glance.

13 files changed, 161 insertions, 116 deletions

diff --git a/src/client.c b/src/client.c
index ca5b7a8..8873699 100644
--- a/src/client.c
+++ b/src/client.c
@@ -82,8 +82,9 @@ static bool send_client_authreq(PgSocket *client)
 	} else if (cf_auth_type == AUTH_MD5) {
 		saltlen = 4;
 		get_random_bytes((void*)client->tmp_login_salt, saltlen);
-	} else if (auth == AUTH_ANY)
+	} else if (auth == AUTH_ANY) {
 		auth = AUTH_TRUST;
+	}
 
 	SEND_generic(res, client, 'R', "ib", auth, client->tmp_login_salt, saltlen);
 	return res;
@@ -177,8 +178,7 @@ bool set_pool(PgSocket *client, const char *dbname, const char *username, const
 			if (cf_log_connections)
 				slog_info(client, "login failed: db=%s user=%s", dbname, username);
 			return false;
-		}
-		else {
+		} else {
 			slog_info(client, "registered new auto-database: db = %s", dbname );
 		}
 	}
@@ -425,8 +425,9 @@ static bool handle_client_startup(PgSocket *client, PktHdr *pkt)
 			/* the packet was already parsed */
 			sbuf_prepare_skip(sbuf, pkt->len);
 			return true;
-		} else
+		} else {
 			return false;
+		}
 	}
 
 	switch (pkt->type) {
@@ -486,8 +487,9 @@ static bool handle_client_startup(PgSocket *client, PktHdr *pkt)
 		{
 			memcpy(client->cancel_key, key, BACKENDKEY_LEN);
 			accept_cancel_request(client);
-		} else
+		} else {
 			disconnect_client(client, false, "bad cancel request");
+		}
 		return false;
 	default:
 		disconnect_client(client, false, "bad packet");
diff --git a/src/dnslookup.c b/src/dnslookup.c
index 53ae344..65c7cb6 100644
--- a/src/dnslookup.c
+++ b/src/dnslookup.c
@@ -338,11 +338,12 @@ static void impl_launch_query(struct DNSRequest *req)
 	return;
 
 failed:
-	if (res == EAI_SYSTEM)
+	if (res == EAI_SYSTEM) {
 		log_warning("dns: getaddrinfo_a(%s)=%d, errno=%d (%s)",
 			    req->name, res, errno, strerror(errno));
-	else
+	} else {
 		log_warning("dns: getaddrinfo_a(%s)=%d", req->name, res);
+	}
 	list_del(&grq->node);
 	free(grq);
 failed2:
diff --git a/src/janitor.c b/src/janitor.c
index c6c47fd..b29b4be 100644
--- a/src/janitor.c
+++ b/src/janitor.c
@@ -144,9 +144,9 @@ static void launch_recheck(PgPool *pool)
 	}
 
 	/* is the check needed? */
-	if (q == NULL || q[0] == 0)
+	if (q == NULL || q[0] == 0) {
 		need_check = false;
-	else if (cf_server_check_delay > 0) {
+	} else if (cf_server_check_delay > 0) {
 		usec_t now = get_cached_time();
 		if (now - server->request_time < cf_server_check_delay)
 			need_check = false;
@@ -159,9 +159,10 @@ static void launch_recheck(PgPool *pool)
 		SEND_generic(res, server, 'Q', "s", q);
 		if (!res)
 			disconnect_server(server, false, "test query failed");
-	} else
+	} else {
 		/* make immediately available */
 		release_server(server);
+	}
 }
 
 /*
@@ -278,8 +279,9 @@ void per_loop_maint(void)
 			if (pool->db->db_paused) {
 				partial_pause = 1;
 				active += per_loop_pause(pool);
-			} else
+			} else {
 				per_loop_activate(pool);
+			}
 			break;
 		case P_PAUSE:
 			active += per_loop_pause(pool);
@@ -294,8 +296,9 @@ void per_loop_maint(void)
 	case P_SUSPEND:
 		if (force_suspend) {
 			close_client_list(&login_client_list, "suspend_timeout");
-		} else
+		} else {
 			active += statlist_count(&login_client_list);
+		}
 	case P_PAUSE:
 		if (!active)
 			admin_pause_done();
@@ -335,13 +338,15 @@ static void pool_client_maint(PgPool *pool)
 			if (client->query_start == 0) {
 				age = now - client->request_time;
 				/* log_warning("query_start==0"); */
-			} else
+			} else {
 				age = now - client->query_start;
+			}
 
-			if (cf_query_timeout > 0 && age > cf_query_timeout)
+			if (cf_query_timeout > 0 && age > cf_query_timeout) {
 				disconnect_client(client, true, "query_timeout");
-			else if (cf_query_wait_timeout > 0 && age > cf_query_wait_timeout)
+			} else if (cf_query_wait_timeout > 0 && age > cf_query_wait_timeout) {
 				disconnect_client(client, true, "query_wait_timeout");
+			}
 		}
 	}
 
@@ -529,10 +534,11 @@ static void cleanup_inactive_autodatabases(void)
 		if (db->db_paused)
 			continue;
 		age = now - db->inactive_time;
-		if (age > cf_autodb_idle_timeout) 
+		if (age > cf_autodb_idle_timeout) {
 			kill_database(db);
-		else
+		} else {
 			break;
+		}
 	}
 }
 
@@ -645,10 +651,11 @@ static void kill_database(PgDatabase *db)
 		slab_free(user_cache, db->forced_user);
 	if (db->connect_query)
 		free((void *)db->connect_query);
-	if (db->inactive_time)
+	if (db->inactive_time) {
 		statlist_remove(&autodatabase_idle_list, &db->head);
-	else
+	} else {
 		statlist_remove(&database_list, &db->head);
+	}
 	aatree_destroy(&db->user_tree);
 	slab_free(db_cache, db);
 }
diff --git a/src/loader.c b/src/loader.c
index 4f66da7..3628be5 100644
--- a/src/loader.c
+++ b/src/loader.c
@@ -220,44 +220,45 @@ bool parse_database(void *base, const char *name, const char *connstr)
 		if (p == NULL) {
 			log_error("%s: syntax error in connstring", name);
 			goto fail;
-		} else if (!key[0])
+		} else if (!key[0]) {
 			break;
+		}
 
-		if (strcmp("dbname", key) == 0)
+		if (strcmp("dbname", key) == 0) {
 			dbname = val;
-		else if (strcmp("host", key) == 0)
+		} else if (strcmp("host", key) == 0) {
 			host = val;
-		else if (strcmp("port", key) == 0)
+		} else if (strcmp("port", key) == 0) {
 			port = val;
-		else if (strcmp("user", key) == 0)
+		} else if (strcmp("user", key) == 0) {
 			username = val;
-		else if (strcmp("password", key) == 0)
+		} else if (strcmp("password", key) == 0) {
 			password = val;
-		else if (strcmp("auth_user", key) == 0)
+		} else if (strcmp("auth_user", key) == 0) {
 			auth_username = val;
-		else if (strcmp("client_encoding", key) == 0)
+		} else if (strcmp("client_encoding", key) == 0) {
 			client_encoding = val;
-		else if (strcmp("datestyle", key) == 0)
+		} else if (strcmp("datestyle", key) == 0) {
 			datestyle = val;
-		else if (strcmp("timezone", key) == 0)
+		} else if (strcmp("timezone", key) == 0) {
 			timezone = val;
-		else if (strcmp("pool_size", key) == 0)
+		} else if (strcmp("pool_size", key) == 0) {
 			pool_size = atoi(val);
-		else if (strcmp("reserve_pool", key) == 0)
+		} else if (strcmp("reserve_pool", key) == 0) {
 			res_pool_size = atoi(val);
-		else if (strcmp("max_db_connections", key) == 0)
+		} else if (strcmp("max_db_connections", key) == 0) {
 			max_db_connections = atoi(val);
-		else if (strcmp("pool_mode", key) == 0) {
+		} else if (strcmp("pool_mode", key) == 0) {
 			if (!cf_set_lookup(&cv, val)) {
 				log_error("skipping database %s because"
 					  " of invalid pool mode: %s", name, val);
 				goto fail;
 			}
-		} else if (strcmp("connect_query", key) == 0)
+		} else if (strcmp("connect_query", key) == 0) {
 			connect_query = val;
-		else if (strcmp("application_name", key) == 0)
+		} else if (strcmp("application_name", key) == 0) {
 			appname = val;
-		else {
+		} else {
 			log_error("skipping database %s because"
 				  " of unknown parameter in connstring: %s", name, key);
 			goto fail;
@@ -296,25 +297,26 @@ bool parse_database(void *base, const char *name, const char *connstr)
 	/* if updating old db, check if anything changed */
 	if (db->dbname) {
 		bool changed = false;
-		if (strcmp(db->dbname, dbname) != 0)
+		if (strcmp(db->dbname, dbname) != 0) {
 			changed = true;
-		else if (!!host != !!db->host)
+		} else if (!!host != !!db->host) {
 			changed = true;
-		else if (host && strcmp(host, db->host) != 0)
+		} else if (host && strcmp(host, db->host) != 0) {
 			changed = true;
-		else if (v_port != db->port)
+		} else if (v_port != db->port) {
 			changed = true;
-		else if (username && !db->forced_user)
+		} else if (username && !db->forced_user) {
 			changed = true;
-		else if (username && strcmp(username, db->forced_user->name) != 0)
+		} else if (username && strcmp(username, db->forced_user->name) != 0) {
 			changed = true;
-		else if (!username && db->forced_user)
+		} else if (!username && db->forced_user) {
 			changed = true;
-		else if ((db->connect_query && !connect_query)
+		} else if ((db->connect_query && !connect_query)
 			 || (!db->connect_query && connect_query)
 			 || (connect_query && strcmp(connect_query, db->connect_query) != 0))
+		{
 			changed = true;
-
+		}
 		if (changed)
 			tag_database_dirty(db);
 	}
@@ -380,9 +382,10 @@ bool parse_database(void *base, const char *name, const char *connstr)
 	if (username != NULL) {
 		if (!force_user(db, username, password))
 			log_warning("db setup failed, trying to continue");
-	} else if (db->forced_user)
+	} else if (db->forced_user) {
 		log_warning("losing forced user not supported,"
 			    " keeping old setting");
+	}
 
 	/* remember dbname */
 	db->dbname = (char *)msg->buf + dbname_ofs;
@@ -415,8 +418,9 @@ bool parse_user(void *base, const char *name, const char *connstr)
 		if (p == NULL) {
 			log_error("%s: syntax error in user settings", name);
 			goto fail;
-		} else if (!key[0])
+		} else if (!key[0]) {
 			break;
+		}
 
 		if (strcmp("pool_mode", key) == 0) {
 			if (!cf_set_lookup(&cv, val)) {
@@ -424,7 +428,6 @@ bool parse_user(void *base, const char *name, const char *connstr)
 					  " of invalid pool mode: %s", name, val);
 				goto fail;
 			}
-
 		} else if (strcmp("max_user_connections", key) == 0) {
 			max_user_connections = atoi(val);
 		} else {
diff --git a/src/main.c b/src/main.c
index 4bf9e85..8667014 100644
--- a/src/main.c
+++ b/src/main.c
@@ -783,10 +783,11 @@ int main(int argc, char *argv[])
 	janitor_setup();
 	stats_setup();
 
-	if (did_takeover)
+	if (did_takeover) {
 		takeover_finish();
-	else
+	} else {
 		pooler_setup();
+	}
 
 	write_pidfile();
 
diff --git a/src/objects.c b/src/objects.c
index d1f54e2..08f1a84 100644
--- a/src/objects.c
+++ b/src/objects.c
@@ -242,12 +242,13 @@ void change_server_state(PgSocket *server, SocketState newstate)
 		statlist_append(&pool->tested_server_list, &server->head);
 		break;
 	case SV_IDLE:
-		if (server->close_needed || cf_server_round_robin)
+		if (server->close_needed || cf_server_round_robin) {
 			/* try to avoid immediate usage then */
 			statlist_append(&pool->idle_server_list, &server->head);
-		else
+		} else {
 			/* otherwise use LIFO */
 			statlist_prepend(&pool->idle_server_list, &server->head);
+		}
 		break;
 	case SV_ACTIVE:
 		statlist_append(&pool->active_server_list, &server->head);
@@ -294,9 +295,9 @@ static void put_in_order(struct List *newitem, struct StatList *list,
 
 	statlist_for_each(item, list) {
 		res = cmpfn(item, newitem);
-		if (res == 0)
+		if (res == 0) {
 			fatal("put_in_order: found existing elem");
-		else if (res > 0) {
+		} else if (res > 0) {
 			statlist_put_before(list, newitem, item);
 			return;
 		}
@@ -581,14 +582,15 @@ bool find_server(PgSocket *client)
 	} else {
 		while (1) {
 			server = first_socket(&pool->idle_server_list);
-			if (!server)
+			if (!server) {
 				break;
-			else if (server->close_needed)
+			} else if (server->close_needed) {
 				disconnect_server(server, true, "obsolete connection");
-			else if (!server->ready)
+			} else if (!server->ready) {
 				disconnect_server(server, true, "idle server got dirty");
-			else
+			} else {
 				break;
+			}
 		}
 
 		if (!server && !check_fast_fail(client))
@@ -617,8 +619,9 @@ bool find_server(PgSocket *client)
 			res = false; /* don't process client data yet */
 			if (!sbuf_pause(&client->sbuf))
 				disconnect_client(client, true, "pause failed");
-		} else
+		} else {
 			res = true;
+		}
 	} else {
 		pause_client(client);
 		res = false;
@@ -694,16 +697,17 @@ bool release_server(PgSocket *server)
 		server->link->link = NULL;
 		server->link = NULL;
 
-		if (*cf_server_reset_query)
+		if (*cf_server_reset_query) {
 			/* notify reset is required */
 			newstate = SV_TESTED;
-		else if (cf_server_check_delay == 0 && *cf_server_check_query)
+		} else if (cf_server_check_delay == 0 && *cf_server_check_query) {
 			/*
 			 * deprecated: before reset_query, the check_delay = 0
 			 * was used to get same effect.  This if() can be removed
 			 * after couple of releases.
 			 */
 			newstate = SV_USED;
+		}
 	case SV_USED:
 	case SV_TESTED:
 		break;
@@ -731,11 +735,12 @@ bool release_server(PgSocket *server)
 	slog_noise(server, "release_server: new state=%d", newstate);
 	change_server_state(server, newstate);
 
-	if (newstate == SV_IDLE)
+	if (newstate == SV_IDLE) {
 		/* immediately process waiters, to give fair chance */
 		return reuse_on_release(server);
-	else if (newstate == SV_TESTED)
+	} else if (newstate == SV_TESTED) {
 		return reset_on_release(server);
+	}
 
 	return true;
 }
@@ -1342,10 +1347,11 @@ bool use_server_socket(int fd, PgAddr *addr,
 			return true;
 	}
 
-	if (db->forced_user)
+	if (db->forced_user) {
 		user = db->forced_user;
-	else
+	} else {
 		user = find_user(username);
+	}
 	if (!user && db->auth_user)
 		user = add_db_user(db, username, password);
 
@@ -1561,17 +1567,19 @@ void reuse_just_freed_objects(void)
 
 	statlist_for_each_safe(item, &justfree_client_list, tmp) {
 		sk = container_of(item, PgSocket, head);
-		if (sbuf_is_closed(&sk->sbuf))
+		if (sbuf_is_closed(&sk->sbuf)) {
 			change_client_state(sk, CL_FREE);
-		else if (close_works)
+		} else if (close_works) {
 			close_works = sbuf_close(&sk->sbuf);
+		}
 	}
 	statlist_for_each_safe(item, &justfree_server_list, tmp) {
 		sk = container_of(item, PgSocket, head);
-		if (sbuf_is_closed(&sk->sbuf))
+		if (sbuf_is_closed(&sk->sbuf)) {
 			change_server_state(sk, SV_FREE);
-		else if (close_works)
+		} else if (close_works) {
 			close_works = sbuf_close(&sk->sbuf);
+		}
 	}
 }
 
diff --git a/src/pktbuf.c b/src/pktbuf.c
index 23d2689..c6cf4df 100644
--- a/src/pktbuf.c
+++ b/src/pktbuf.c
@@ -131,8 +131,9 @@ static void pktbuf_send_func(int fd, short flags, void *arg)
 			log_error("pktbuf_send_func: %s", strerror(errno));
 			pktbuf_free(buf);
 		}
-	} else
+	} else {
 		pktbuf_free(buf);
+	}
 }
 
 bool pktbuf_send_queued(PktBuf *buf, PgSocket *sk)
@@ -369,8 +370,9 @@ void pktbuf_write_RowDescription(PktBuf *buf, const char *tupdesc, ...)
 		} else if (tupdesc[i] == 'T') {
 			pktbuf_put_uint32(buf, TEXTOID);
 			pktbuf_put_uint16(buf, -1);
-		} else
+		} else {
 			fatal("bad tupdesc");
+		}
 		pktbuf_put_uint32(buf, 0);
 		pktbuf_put_uint16(buf, 0);
 	}
@@ -412,8 +414,9 @@ void pktbuf_write_DataRow(PktBuf *buf, const char *tupdesc, ...)
 		} else if (tupdesc[i] == 'T') {
 			usec_t time = va_arg(ap, usec_t);
 			val = format_time_s(time, tmp, sizeof(tmp));
-		} else
+		} else {
 			fatal("bad tupdesc: %s", tupdesc);
+		}
 
 		if (val) {
 			len = strlen(val);
diff --git a/src/pooler.c b/src/pooler.c
index 42902df..2752213 100644
--- a/src/pooler.c
+++ b/src/pooler.c
@@ -267,10 +267,11 @@ static const char *addrpair(const PgAddr *src, const PgAddr *dst)
 
 static const char *conninfo(const PgSocket *sk)
 {
-	if (is_server_socket(sk))
+	if (is_server_socket(sk)) {
 		return addrpair(&sk->local_addr, &sk->remote_addr);
-	else
+	} else {
 		return addrpair(&sk->remote_addr, &sk->local_addr);
+	}
 }
 
 /* got new connection, associate it with client struct */
diff --git a/src/proto.c b/src/proto.c
index 39741cb..6a31589 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -71,15 +71,15 @@ bool get_header(struct MBuf *data, PktHdr *pkt)
 		len = len16;
 		if (!mbuf_get_uint32be(&hdr, &code))
 			return false;
-		if (code == PKT_CANCEL)
+		if (code == PKT_CANCEL) {
 			type = PKT_CANCEL;
-		else if (code == PKT_SSLREQ)
+		} else if (code == PKT_SSLREQ) {
 			type = PKT_SSLREQ;
-		else if ((code >> 16) == 3 && (code & 0xFFFF) < 2)
+		} else if ((code >> 16) == 3 && (code & 0xFFFF) < 2) {
 			type = PKT_STARTUP;
-		else if (code == PKT_STARTUP_V2)
+		} else if (code == PKT_STARTUP_V2) {
 			type = PKT_STARTUP_V2;
-		else {
+		} else {
 			log_noise("get_header: unknown special pkt: len=%u code=%u", len, code);
 			return false;
 		}
@@ -95,10 +95,11 @@ bool get_header(struct MBuf *data, PktHdr *pkt)
 	pkt->len = len;
 
 	/* fill pkt with only data for this packet */
-	if (len > mbuf_avail_for_read(data))
+	if (len > mbuf_avail_for_read(data)) {
 		avail = mbuf_avail_for_read(data);
-	else
+	} else {
 		avail = len;
+	}
 	if (!mbuf_slice(data, avail, &pkt->data))
 		return false;
 
@@ -141,10 +142,11 @@ void parse_server_error(PktHdr *pkt, const char **level_p, const char **msg_p)
 			break;
 		if (!mbuf_get_string(&pkt->data, &val))
 			break;
-		if (type == 'S')
+		if (type == 'S') {
 			level = val;
-		else if (type == 'M')
+		} else if (type == 'M') {
 			msg = val;
+		}
 	}
 	*level_p = level;
 	*msg_p = msg;
@@ -156,10 +158,11 @@ void log_server_error(const char *note, PktHdr *pkt)
 
 	parse_server_error(pkt, &level, &msg);
 
-	if (!msg || !level)
+	if (!msg || !level) {
 		log_error("%s: partial error message, cannot log", note);
-	else
+	} else {
 		log_error("%s: %s: %s", note, level, msg);
+	}
 }
 
 
@@ -298,8 +301,9 @@ static bool login_md5_psw(PgSocket *server, const uint8_t *salt)
 	if (!isMD5(user->passwd)) {
 		pg_md5_encrypt(user->passwd, user->name, strlen(user->name), txt);
 		src = txt + 3;
-	} else
+	} else {
 		src = user->passwd + 3;
+	}
 	pg_md5_encrypt(src, (char *)salt, 4, txt);
 
 	return send_password(server, txt);
@@ -399,9 +403,10 @@ int scan_text_result(struct MBuf *pkt, const char *tupdesc, ...)
 				xval[len] = 0;
 				val = xval;
 			}
-		} else
+		} else {
 			/* tuple was shorter than requested */
 			val = NULL;
+		}
 
 		switch (tupdesc[i]) {
 		case 'i':
diff --git a/src/sbuf.c b/src/sbuf.c
index b9559d5..847e0a6 100644
--- a/src/sbuf.c
+++ b/src/sbuf.c
@@ -121,9 +121,10 @@ bool sbuf_connect(SBuf *sbuf, const struct sockaddr *sa, int sa_len, int timeout
 	 * common stuff
 	 */
 	sock = socket(sa->sa_family, SOCK_STREAM, 0);
-	if (sock < 0)
+	if (sock < 0) {
 		/* probably fd limit */
 		goto failed;
+	}
 
 	if (!tune_socket(sock, is_unix))
 		goto failed;
@@ -233,11 +234,11 @@ bool sbuf_close(SBuf *sbuf)
 		/* event_del() acts funny occasionally, debug it */
 		errno = 0;
 		if (event_del(&sbuf->ev) < 0) {
-			if (errno)
+			if (errno) {
 				log_warning("event_del: %s", strerror(errno));
-			else
+			} else {
 				log_warning("event_del: libevent error");
-
+			}
 			/* we can retry whole sbuf_close() if needed */
 			/* if (errno == ENOMEM) return false; */
 		}
@@ -317,13 +318,13 @@ static bool sbuf_call_proto(SBuf *sbuf, int event)
 	Assert(event != SBUF_EV_READ || iobuf_amount_parse(io) > 0);
 
 	/* if pkt callback, limit only with current packet */
-	if (event == SBUF_EV_PKT_CALLBACK)
+	if (event == SBUF_EV_PKT_CALLBACK) {
 		iobuf_parse_limit(io, &mbuf, sbuf->pkt_remain);
-	else if (event == SBUF_EV_READ)
+	} else if (event == SBUF_EV_READ) {
 		iobuf_parse_all(io, &mbuf);
-	else
+	} else {
 		memset(&mbuf, 0, sizeof(mbuf));
-
+	}
 	res = sbuf->proto_cb(sbuf, event, &mbuf);
 
 	AssertSanity(sbuf);
@@ -367,9 +368,10 @@ static void sbuf_send_cb(int sock, short flags, void *arg)
 	if (res) {
 		/* here we should certainly skip recv() */
 		sbuf_main_loop(sbuf, SKIP_RECV);
-	} else
+	} else {
 		/* drop if problems */
 		sbuf_call_proto(sbuf, SBUF_EV_SEND_FAILED);
+	}
 }
 
 /* socket is full, wait until it's writable again */
@@ -432,8 +434,9 @@ try_more:
 			if (!sbuf_queue_send(sbuf))
 				/* drop if queue failed */
 				sbuf_call_proto(sbuf, SBUF_EV_SEND_FAILED);
-		} else
+		} else {
 			sbuf_call_proto(sbuf, SBUF_EV_SEND_FAILED);
+		}
 		return false;
 	}
 
@@ -516,9 +519,10 @@ static void sbuf_try_resync(SBuf *sbuf, bool release)
 {
 	IOBuf *io = sbuf->io;
 
-	if (io)
+	if (io) {
 		log_noise("resync: done=%d, parse=%d, recv=%d",
 			  io->done_pos, io->parse_pos, io->recv_pos);
+	}
 	AssertActive(sbuf);
 
 	if (!io)
@@ -527,8 +531,9 @@ static void sbuf_try_resync(SBuf *sbuf, bool release)
 	if (release && iobuf_empty(io)) {
 		slab_free(iobuf_cache, io);
 		sbuf->io = NULL;
-	} else
+	} else {
 		iobuf_try_resync(io, SBUF_SMALL_PKT);
+	}
 }
 
 /* actually ask kernel for more data */
@@ -710,8 +715,9 @@ bool sbuf_answer(SBuf *sbuf, const void *buf, unsigned len)
 	res = safe_send(sbuf->sock, buf, len, 0);
 	if (res < 0) {
 		log_debug("sbuf_answer: error sending: %s", strerror(errno));
-	} else if ((unsigned)res != len)
+	} else if ((unsigned)res != len) {
 		log_debug("sbuf_answer: partial send: len=%d sent=%d", len, res);
+	}
 	return (unsigned)res == len;
 }
 
diff --git a/src/system.c b/src/system.c
index 20ac556..c7ed15c 100644
--- a/src/system.c
+++ b/src/system.c
@@ -108,15 +108,17 @@ void change_file_mode(const char *fn, mode_t mode,
 	/* change user/group */
 	if (uid != (uid_t)-1 || gid != (gid_t)-1) {
 		res = chown(fn, uid, gid);
-		if (res != 0)
+		if (res != 0) {
 			fatal("chown(%s, %d, %d) failed: %s",
 			      fn, uid, gid, strerror(errno));
+		}
 	}
 
 	/* change mode */
 	res = chmod(fn, mode);
-	if (res != 0)
+	if (res != 0) {
 		fatal("Failure to chmod(%s, 0%o): %s",
 		      fn, mode, strerror(errno));
+	}
 }
 
diff --git a/src/takeover.c b/src/takeover.c
index 18a384d..3209d54 100644
--- a/src/takeover.c
+++ b/src/takeover.c
@@ -95,8 +95,9 @@ static void takeover_load_fd(struct MBuf *pkt, const struct cmsghdr *cmsg)
 		/* get the fd */
 		memcpy(&fd, CMSG_DATA(cmsg), sizeof(int));
 		log_debug("got fd: %d", fd);
-	} else
+	} else {
 		fatal("broken fd packet");
+	}
 
 	/* parse row contents */
 	got = scan_text_result(pkt, "issssiqisssss", &oldfd, &task, &user, &db,
@@ -123,18 +124,19 @@ static void takeover_load_fd(struct MBuf *pkt, const struct cmsghdr *cmsg)
 	}
 
 	/* decide what to do with it */
-	if (strcmp(task, "client") == 0)
+	if (strcmp(task, "client") == 0) {
 		res = use_client_socket(fd, &addr, db, user, ckey, oldfd, linkfd,
 				  client_enc, std_string, datestyle, timezone,
 				  password);
-	else if (strcmp(task, "server") == 0)
+	} else if (strcmp(task, "server") == 0) {
 		res = use_server_socket(fd, &addr, db, user, ckey, oldfd, linkfd,
 				  client_enc, std_string, datestyle, timezone,
 				  password);
-	else if (strcmp(task, "pooler") == 0)
+	} else if (strcmp(task, "pooler") == 0) {
 		res = use_pooler_socket(fd, pga_is_unix(&addr));
-	else
+	} else {
 		fatal("unknown task: %s", task);
+	}
 
 	if (!res)
 		fatal("socket takeover failed - no mem?");
@@ -213,8 +215,9 @@ static void next_command(PgSocket *bouncer, struct MBuf *pkt)
 		log_info("SHOW FDS finished");
 
 		takeover_finish_part1(bouncer);
-	} else
+	} else {
 		fatal("got bad CMD from old bouncer: %s", cmd);
+	}
 
 	if (!res)
 		fatal("command send failed");
diff --git a/src/util.c b/src/util.c
index 9fc1686..986baed 100644
--- a/src/util.c
+++ b/src/util.c
@@ -54,12 +54,13 @@ int log_socket_prefix(enum LogLevel lev, void *ctx, char *dst, unsigned int dstl
 		host = pga_ntop(&sock->remote_addr, host6, sizeof(host6));
 	}
 
-	if (pga_family(&sock->remote_addr) == AF_INET6)
+	if (pga_family(&sock->remote_addr) == AF_INET6) {
 		return snprintf(dst, dstlen, "%c-%p: %s/%s@[%s]:%d ",
 			stype, sock, db, user, host, port);
-	else
+	} else {
 		return snprintf(dst, dstlen, "%c-%p: %s/%s@%s:%d ",
 			stype, sock, db, user, host, port);
+	}
 }
 
 const char *bin2hex(const uint8_t *src, unsigned srclen, char *dst, unsigned dstlen)
@@ -403,12 +404,13 @@ const char *pga_str(const PgAddr *a, char *dst, int dstlen)
 {
 	char buf[PGADDR_BUF];
 	pga_ntop(a, buf, sizeof(buf));
-	if (pga_family(a) == AF_INET6)
+	if (pga_family(a) == AF_INET6) {
 		snprintf(dst, dstlen, "[%s]:%d", buf, pga_port(a));
-	else if (pga_family(a) == AF_UNIX && a->scred.pid)
+	} else if (pga_family(a) == AF_UNIX && a->scred.pid) {
 		snprintf(dst, dstlen, "%s:%d$%u", buf, pga_port(a), a->scred.pid);
-	else
+	} else {
 		snprintf(dst, dstlen, "%s:%d", buf, pga_port(a));
+	}
 	return dst;
 }
 
@@ -429,12 +431,13 @@ const char *pga_details(const PgAddr *a, char *dst, int dstlen)
 {
 	char buf[PGADDR_BUF];
 	pga_ntop(a, buf, sizeof(buf));
-	if (pga_family(a) == AF_INET6)
+	if (pga_family(a) == AF_INET6) {
 		snprintf(dst, dstlen, "[%s]:%d", buf, pga_port(a));
-	else if (pga_family(a) == AF_UNIX && a->scred.pid)
+	} else if (pga_family(a) == AF_UNIX && a->scred.pid) {
 		snprintf(dst, dstlen, "%s(%u@%s):%d", buf, a->scred.pid, cached_hostname(), pga_port(a));
-	else
+	} else {
 		snprintf(dst, dstlen, "%s:%d", buf, pga_port(a));
+	}
 	return dst;
 }