A Whole New World (clang-format edition)

I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code

1 files changed, 23 insertions, 25 deletions

diff --git a/drivers/unix/socket_helpers.h b/drivers/unix/socket_helpers.h
index fd5fa618ca..d27328a01e 100644
--- a/drivers/unix/socket_helpers.h
+++ b/drivers/unix/socket_helpers.h
@@ -31,28 +31,28 @@
 
 #include <string.h>
 
-#if defined(__MINGW32__ ) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 4)
-  // Workaround for mingw-w64 < 4.0
-  #ifndef IPV6_V6ONLY
-    #define IPV6_V6ONLY 27
-  #endif
+#if defined(__MINGW32__) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 4)
+// Workaround for mingw-w64 < 4.0
+#ifndef IPV6_V6ONLY
+#define IPV6_V6ONLY 27
+#endif
 #endif
 
 // helpers for sockaddr -> IP_Address and back, should work for posix and winsock. All implementations should use this
 
-static size_t _set_sockaddr(struct sockaddr_storage* p_addr, const IP_Address& p_ip, int p_port, IP::Type p_sock_type = IP::TYPE_ANY) {
+static size_t _set_sockaddr(struct sockaddr_storage *p_addr, const IP_Address &p_ip, int p_port, IP::Type p_sock_type = IP::TYPE_ANY) {
 
 	memset(p_addr, 0, sizeof(struct sockaddr_storage));
 
-	ERR_FAIL_COND_V(!p_ip.is_valid(),0);
+	ERR_FAIL_COND_V(!p_ip.is_valid(), 0);
 
 	// IPv6 socket
 	if (p_sock_type == IP::TYPE_IPV6 || p_sock_type == IP::TYPE_ANY) {
 
 		// IPv6 only socket with IPv4 address
-		ERR_FAIL_COND_V(p_sock_type == IP::TYPE_IPV6 && p_ip.is_ipv4(),0);
+		ERR_FAIL_COND_V(p_sock_type == IP::TYPE_IPV6 && p_ip.is_ipv4(), 0);
 
-		struct sockaddr_in6* addr6 = (struct sockaddr_in6*)p_addr;
+		struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)p_addr;
 		addr6->sin6_family = AF_INET6;
 		addr6->sin6_port = htons(p_port);
 		copymem(&addr6->sin6_addr.s6_addr, p_ip.get_ipv6(), 16);
@@ -61,36 +61,36 @@ static size_t _set_sockaddr(struct sockaddr_storage* p_addr, const IP_Address& p
 	} else { // IPv4 socket
 
 		// IPv4 socket with IPv6 address
-		ERR_FAIL_COND_V(!p_ip.is_ipv4(),0);
+		ERR_FAIL_COND_V(!p_ip.is_ipv4(), 0);
 
 		uint32_t ipv4 = *((uint32_t *)p_ip.get_ipv4());
-		struct sockaddr_in* addr4 = (struct sockaddr_in*)p_addr;
+		struct sockaddr_in *addr4 = (struct sockaddr_in *)p_addr;
 		addr4->sin_family = AF_INET;
-		addr4->sin_port = htons(p_port);  // short, network byte order
+		addr4->sin_port = htons(p_port); // short, network byte order
 		copymem(&addr4->sin_addr.s_addr, p_ip.get_ipv4(), 16);
 		return sizeof(sockaddr_in);
 	};
 };
 
-static size_t _set_listen_sockaddr(struct sockaddr_storage* p_addr, int p_port, IP::Type p_sock_type, const IP_Address p_bind_address) {
+static size_t _set_listen_sockaddr(struct sockaddr_storage *p_addr, int p_port, IP::Type p_sock_type, const IP_Address p_bind_address) {
 
 	memset(p_addr, 0, sizeof(struct sockaddr_storage));
 	if (p_sock_type == IP::TYPE_IPV4) {
-		struct sockaddr_in* addr4 = (struct sockaddr_in*)p_addr;
+		struct sockaddr_in *addr4 = (struct sockaddr_in *)p_addr;
 		addr4->sin_family = AF_INET;
 		addr4->sin_port = htons(p_port);
-		if(p_bind_address.is_valid()) {
+		if (p_bind_address.is_valid()) {
 			copymem(&addr4->sin_addr.s_addr, p_bind_address.get_ipv4(), 4);
 		} else {
 			addr4->sin_addr.s_addr = INADDR_ANY;
 		}
 		return sizeof(sockaddr_in);
 	} else {
-		struct sockaddr_in6* addr6 = (struct sockaddr_in6*)p_addr;
+		struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)p_addr;
 
 		addr6->sin6_family = AF_INET6;
 		addr6->sin6_port = htons(p_port);
-		if(p_bind_address.is_valid()) {
+		if (p_bind_address.is_valid()) {
 			copymem(&addr6->sin6_addr.s6_addr, p_bind_address.get_ipv6(), 16);
 		} else {
 			addr6->sin6_addr = in6addr_any;
@@ -106,12 +106,12 @@ static int _socket_create(IP::Type p_type, int type, int protocol) {
 	int family = p_type == IP::TYPE_IPV4 ? AF_INET : AF_INET6;
 	int sockfd = socket(family, type, protocol);
 
-	ERR_FAIL_COND_V( sockfd == -1, -1 );
+	ERR_FAIL_COND_V(sockfd == -1, -1);
 
-	if(family == AF_INET6) {
+	if (family == AF_INET6) {
 		// Select IPv4 over IPv6 mapping
 		int opt = p_type != IP::TYPE_ANY;
-		if(setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&opt, sizeof(opt)) != 0) {
+		if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&opt, sizeof(opt)) != 0) {
 			WARN_PRINT("Unable to set/unset IPv4 address mapping over IPv6");
 		}
 	}
@@ -119,24 +119,22 @@ static int _socket_create(IP::Type p_type, int type, int protocol) {
 	return sockfd;
 }
 
-
-static void _set_ip_addr_port(IP_Address& r_ip, int& r_port, struct sockaddr_storage* p_addr) {
+static void _set_ip_addr_port(IP_Address &r_ip, int &r_port, struct sockaddr_storage *p_addr) {
 
 	if (p_addr->ss_family == AF_INET) {
 
-		struct sockaddr_in* addr4 = (struct sockaddr_in*)p_addr;
+		struct sockaddr_in *addr4 = (struct sockaddr_in *)p_addr;
 		r_ip.set_ipv4((uint8_t *)&(addr4->sin_addr.s_addr));
 
 		r_port = ntohs(addr4->sin_port);
 
 	} else if (p_addr->ss_family == AF_INET6) {
 
-		struct sockaddr_in6* addr6 = (struct sockaddr_in6*)p_addr;
+		struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)p_addr;
 		r_ip.set_ipv6(addr6->sin6_addr.s6_addr);
 
 		r_port = ntohs(addr6->sin6_port);
 	};
 };
 
-
 #endif