From d3352b997ca59a336a40fe6660c6e5b7079864aa Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Sun, 28 Jun 2020 14:58:32 +0200
Subject: Run clang-format on source tree (excl igmp.c)

---
 minecproxy/server-rcon.c | 64 ++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 38 deletions(-)

(limited to 'minecproxy/server-rcon.c')

diff --git a/minecproxy/server-rcon.c b/minecproxy/server-rcon.c
index b19bdb1..9562aa9 100644
--- a/minecproxy/server-rcon.c
+++ b/minecproxy/server-rcon.c
@@ -16,8 +16,7 @@
 #include "server-rcon.h"
 #include "rcon-protocol.h"
 
-static int
-rcon_packet_complete(struct uring_task *task, _unused_ int res)
+static int rcon_packet_complete(struct uring_task *task, _unused_ int res)
 {
 	assert_return(task, -EINVAL);
 	assert_task_alive_or(DBG_RCON, task, return -EINTR);
@@ -25,23 +24,22 @@ rcon_packet_complete(struct uring_task *task, _unused_ int res)
 	return rcon_protocol_packet_complete(task->tbuf->buf, task->tbuf->len);
 }
 
-static bool
-rcon_check_reply(struct uring_task *task, int res, int32_t *id,
-		 int32_t *type, const char **msg)
+static bool rcon_check_reply(struct uring_task *task, int res, int32_t *id,
+			     int32_t *type, const char **msg)
 {
 	struct server *server = container_of(task, struct server, rcon_task);
 	const char *error;
 
 	if (res < 0) {
-		error("rcon(%s): reading reply failed, res: %i",
-		      server->name, res);
+		error("rcon(%s): reading reply failed, res: %i", server->name,
+		      res);
 		goto error;
 	}
 
-	if (!rcon_protocol_read_packet(task->tbuf->buf, task->tbuf->len,
-				       id, type, msg, &error)) {
-		error("rcon(%s): failed to parse packet: %s",
-		      server->name, error);
+	if (!rcon_protocol_read_packet(task->tbuf->buf, task->tbuf->len, id,
+				       type, msg, &error)) {
+		error("rcon(%s): failed to parse packet: %s", server->name,
+		      error);
 		goto error;
 	}
 
@@ -52,8 +50,7 @@ error:
 	return false;
 }
 
-static void
-rcon_stop_reply(struct uring_task *task, int res)
+static void rcon_stop_reply(struct uring_task *task, int res)
 {
 	struct server *server = container_of(task, struct server, rcon_task);
 	int32_t id;
@@ -82,8 +79,7 @@ out:
 	uring_task_close_fd(task);
 }
 
-static void
-rcon_stop_sent(struct uring_task *task, int res)
+static void rcon_stop_sent(struct uring_task *task, int res)
 {
 	struct server *server = container_of(task, struct server, rcon_task);
 
@@ -101,8 +97,7 @@ rcon_stop_sent(struct uring_task *task, int res)
 	uring_tbuf_read_until(task, rcon_packet_complete, rcon_stop_reply);
 }
 
-static void
-rcon_login_reply(struct uring_task *task, int res)
+static void rcon_login_reply(struct uring_task *task, int res)
 {
 	struct server *server = container_of(task, struct server, rcon_task);
 	int32_t id;
@@ -140,8 +135,7 @@ error:
 	uring_task_close_fd(task);
 }
 
-static void
-rcon_login_sent(struct uring_task *task, int res)
+static void rcon_login_sent(struct uring_task *task, int res)
 {
 	struct server *server = container_of(task, struct server, rcon_task);
 
@@ -149,8 +143,8 @@ rcon_login_sent(struct uring_task *task, int res)
 	assert_task_alive(DBG_RCON, task);
 
 	if (res != task->tbuf->len) {
-		error("rcon(%s): sending login failed, res: %i",
-		      server->name, res);
+		error("rcon(%s): sending login failed, res: %i", server->name,
+		      res);
 		uring_task_close_fd(task);
 		return;
 	}
@@ -159,8 +153,7 @@ rcon_login_sent(struct uring_task *task, int res)
 	uring_tbuf_read_until(task, rcon_packet_complete, rcon_login_reply);
 }
 
-static void
-rcon_connected_cb(struct connection *conn, bool connected)
+static void rcon_connected_cb(struct connection *conn, bool connected)
 {
 	struct server *server = container_of(conn, struct server, rcon_conn);
 
@@ -175,13 +168,11 @@ rcon_connected_cb(struct connection *conn, bool connected)
 	rcon_protocol_create_packet(server->rcon_tbuf.buf,
 				    sizeof(server->rcon_tbuf.buf),
 				    &server->rcon_tbuf.len, 1,
-				    RCON_PACKET_LOGIN,
-				    server->rcon_password);
+				    RCON_PACKET_LOGIN, server->rcon_password);
 	uring_tbuf_write(&server->rcon_task, rcon_login_sent);
 }
 
-static void
-rcon_free(struct uring_task *task)
+static void rcon_free(struct uring_task *task)
 {
 	struct server *server = container_of(task, struct server, rcon_task);
 
@@ -190,25 +181,24 @@ rcon_free(struct uring_task *task)
 	debug(DBG_RCON, "task %p, server %s (%p)", task, server->name, server);
 }
 
-void
-rcon_stop(struct server *server)
+void rcon_stop(struct server *server)
 {
-	assert_return(server && !list_empty(&server->rcons) && !empty_str(server->rcon_password));
+	assert_return(server && !list_empty(&server->rcons) &&
+		      !empty_str(server->rcon_password));
 	assert_task_alive(DBG_RCON, &server->rcon_task);
 
-	connect_any(&server->rcon_task, &server->rcons, &server->rcon_conn, rcon_connected_cb);
+	connect_any(&server->rcon_task, &server->rcons, &server->rcon_conn,
+		    rcon_connected_cb);
 }
 
-void
-rcon_refdump(struct server *server)
+void rcon_refdump(struct server *server)
 {
 	assert_return(server);
 
 	uring_task_refdump(&server->rcon_task);
 }
 
-void
-rcon_delete(struct server *server)
+void rcon_delete(struct server *server)
 {
 	assert_return(server);
 
@@ -216,12 +206,10 @@ rcon_delete(struct server *server)
 	uring_task_destroy(&server->rcon_task);
 }
 
-void
-rcon_init(struct server *server)
+void rcon_init(struct server *server)
 {
 	assert_return(server);
 
 	uring_task_init(&server->rcon_task, "rcon", &server->task, rcon_free);
 	uring_task_set_buf(&server->rcon_task, &server->rcon_tbuf);
 }
-
-- 
cgit v1.2.3