Run clang-format on source tree (excl igmp.c)

1 files changed, 19 insertions, 27 deletions

diff --git a/minecctl/misc.c b/minecctl/misc.c
index 72eb03c..8f0761f 100644
--- a/minecctl/misc.c
+++ b/minecctl/misc.c
@@ -11,8 +11,7 @@
 bool use_colors = false;
 
 /* FIXME: Can be shared */
-void
-set_use_colors()
+void set_use_colors()
 {
 	int fd;
 	const char *e;
@@ -37,8 +36,7 @@ set_use_colors()
 	use_colors = true;
 }
 
-char *
-strv_join(char * const *strv)
+char *strv_join(char *const *strv)
 {
 	size_t len = 0;
 	char *r, *to;
@@ -61,8 +59,7 @@ strv_join(char * const *strv)
 	return r;
 }
 
-int
-connect_any(struct list_head *addrs, bool may_fail)
+int connect_any(struct list_head *addrs, bool may_fail)
 {
 	struct saddr *saddr;
 	bool connected = false;
@@ -78,13 +75,15 @@ connect_any(struct list_head *addrs, bool may_fail)
 
 	list_for_each_entry(saddr, addrs, list) {
 		verbose("Attempting connection to %s", saddr->addrstr);
-		sfd = socket(saddr->storage.ss_family, SOCK_STREAM | SOCK_CLOEXEC, 0);
+		sfd = socket(saddr->st.ss_family, SOCK_STREAM | SOCK_CLOEXEC,
+			     0);
 		if (sfd < 0)
 			die("socket: %m");
 
 		socket_set_low_latency(sfd, true, true, true);
 
-		if (connect(sfd, (struct sockaddr *)&saddr->storage, saddr->addrlen) < 0) {
+		if (connect(sfd, (struct sockaddr *)&saddr->st,
+			    saddr->addrlen) < 0) {
 			close(sfd);
 			continue;
 		}
@@ -101,8 +100,7 @@ connect_any(struct list_head *addrs, bool may_fail)
 	return sfd;
 }
 
-char *
-ask_password()
+char *ask_password()
 {
 	struct termios old, new;
 	char *password = NULL;
@@ -139,8 +137,7 @@ ask_password()
 	return password;
 }
 
-void
-free_password(char **password)
+void free_password(char **password)
 {
 	if (!password || !*password)
 		return;
@@ -150,8 +147,7 @@ free_password(char **password)
 	*password = NULL;
 }
 
-void
-__debug(_unused_ enum debug_lvl lvl, const char *fmt, ...)
+void __debug(_unused_ enum debug_lvl lvl, const char *fmt, ...)
 {
 	va_list ap;
 
@@ -170,8 +166,7 @@ __debug(_unused_ enum debug_lvl lvl, const char *fmt, ...)
 		fprintf(stderr, ANSI_NORMAL);
 }
 
-_noreturn_ void
-__die(const char *fmt, ...)
+_noreturn_ void __die(const char *fmt, ...)
 {
 	va_list ap;
 
@@ -182,8 +177,7 @@ __die(const char *fmt, ...)
 	exit(EXIT_FAILURE);
 }
 
-void *
-__zmalloc(const char *fn, int line, size_t size)
+void *__zmalloc(const char *fn, int line, size_t size)
 {
 	void *ptr;
 
@@ -195,12 +189,12 @@ __zmalloc(const char *fn, int line, size_t size)
 	return ptr;
 }
 
-char *
-__xstrdup(const char *fn, int line, const char *s)
+char *__xstrdup(const char *fn, int line, const char *s)
 {
 	char *ptr;
 
-	assert_die(!empty_str(fn) && line > 0 && !empty_str(s), "invalid arguments");
+	assert_die(!empty_str(fn) && line > 0 && !empty_str(s),
+		   "invalid arguments");
 
 	ptr = strdup(s);
 	if (!ptr)
@@ -208,12 +202,12 @@ __xstrdup(const char *fn, int line, const char *s)
 	return ptr;
 }
 
-char *
-__xstrndup(const char *fn, int line, const char *s, size_t n)
+char *__xstrndup(const char *fn, int line, const char *s, size_t n)
 {
 	char *ptr;
 
-	assert_die(!empty_str(fn) && line > 0 && !empty_str(s) && n > 0, "invalid arguments");
+	assert_die(!empty_str(fn) && line > 0 && !empty_str(s) && n > 0,
+		   "invalid arguments");
 
 	ptr = strndup(s, n);
 	if (ptr)
@@ -221,11 +215,9 @@ __xstrndup(const char *fn, int line, const char *s, size_t n)
 	return ptr;
 }
 
-void
-__xfree(const char *fn, int line, void *ptr)
+void __xfree(const char *fn, int line, void *ptr)
 {
 	assert_die(!empty_str(fn) && line > 0, "invalid arguments");
 
 	free(ptr);
 }
-