From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Fri, 26 Jan 2018 18:15:28 +0000 (+0100)
Subject: Fix some style nits in commit eee8a40
X-Git-Tag: OpenSSL_1_1_1-pre1~120
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=df05f155a69b96b174e0e47bc689bf729de684b6;p=oweals%2Fopenssl.git

Fix some style nits in commit eee8a40

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5173)
---

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 4f1e751378..485b419387 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -187,17 +187,19 @@ int do_server(int *accept_sock, const char *host, const char *port,
     sock_protocol = BIO_ADDRINFO_protocol(res);
     sock_address = BIO_ADDRINFO_address(res);
     next = BIO_ADDRINFO_next(res);
-    if(sock_family == AF_INET6)
+    if (sock_family == AF_INET6)
         sock_options |= BIO_SOCK_V6_ONLY;
     if (next != NULL
-        && BIO_ADDRINFO_socktype(next) == sock_type
-        && BIO_ADDRINFO_protocol(next) == sock_protocol) {
-        if (sock_family == AF_INET && BIO_ADDRINFO_family(next) == AF_INET6) {
+            && BIO_ADDRINFO_socktype(next) == sock_type
+            && BIO_ADDRINFO_protocol(next) == sock_protocol) {
+        if (sock_family == AF_INET
+                && BIO_ADDRINFO_family(next) == AF_INET6) {
             sock_family = AF_INET6;
             sock_address = BIO_ADDRINFO_address(next);
-        }
-        else if (sock_family == AF_INET6 && BIO_ADDRINFO_family(next) == AF_INET)
+        } else if (sock_family == AF_INET6
+                   && BIO_ADDRINFO_family(next) == AF_INET) {
             sock_options &= ~BIO_SOCK_V6_ONLY;
+        }
     }
 
     asock = BIO_socket(sock_family, sock_type, sock_protocol, 0);