Cleanup in //runtime/bin

runtime/bin/socket_win.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
 #include "bin/socket.h"
 #include "bin/socket_win.h"
 
@@ skipping 36 matching lines @@
                              address,
                              &l) != 0;
 }
 
 
 static Mutex* init_mutex = new Mutex();
 static bool socket_initialized = false;
 
 bool Socket::Initialize() {
   MutexLocker lock(init_mutex);
-  if (socket_initialized) return true;
+  if (socket_initialized) {
+    return true;
+  }
   int err;
   WSADATA winsock_data;
   WORD version_requested = MAKEWORD(2, 2);
   err = WSAStartup(version_requested, &winsock_data);
   if (err == 0) {
     socket_initialized = true;
   } else {
     Log::PrintErr("Unable to initialize Winsock: %d\n", WSAGetLastError());
   }
-  return err == 0;
+  return (err == 0);
 }
 
 intptr_t Socket::Available(intptr_t fd) {
   ClientSocket* client_socket = reinterpret_cast<ClientSocket*>(fd);
   return client_socket->Available();
 }
 
 
 intptr_t Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
   Handle* handle = reinterpret_cast<Handle*>(fd);
@@ skipping 22 matching lines @@
   return handle->SendTo(
     buffer, num_bytes, &raw.addr, SocketAddress::GetAddrLength(addr));
 }
 
 
 intptr_t Socket::GetPort(intptr_t fd) {
   ASSERT(reinterpret_cast<Handle*>(fd)->is_socket());
   SocketHandle* socket_handle = reinterpret_cast<SocketHandle*>(fd);
   RawAddr raw;
   socklen_t size = sizeof(raw);
-  if (getsockname(socket_handle->socket(),
-                  &raw.addr,
-                  &size) == SOCKET_ERROR) {
+  if (getsockname(socket_handle->socket(),  &raw.addr, &size) == SOCKET_ERROR) {
     return 0;
   }
   return SocketAddress::GetAddrPort(raw);
 }
 
 
 SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
   ASSERT(reinterpret_cast<Handle*>(fd)->is_socket());
   SocketHandle* socket_handle = reinterpret_cast<SocketHandle*>(fd);
   RawAddr raw;
   socklen_t size = sizeof(raw);
-  if (getpeername(socket_handle->socket(),
-                  &raw.addr,
-                  &size)) {
+  if (getpeername(socket_handle->socket(), &raw.addr, &size)) {
     return NULL;
   }
   *port = SocketAddress::GetAddrPort(raw);
   // Clear the port before calling WSAAddressToString as WSAAddressToString
   // includes the port in the formatted string.
   SocketAddress::SetAddrPort(&raw, 0);
   return new SocketAddress(&raw.addr);
 }
 
 
@@ skipping 124 matching lines @@
   switch (GetFileType(handle->handle())) {
     case FILE_TYPE_CHAR: return File::kTerminal;
     case FILE_TYPE_PIPE: return File::kPipe;
     case FILE_TYPE_DISK: return File::kFile;
     default: return GetLastError == NO_ERROR ? File::kOther : -1;
   }
 }
 
 
 intptr_t Socket::GetStdioHandle(intptr_t num) {
-  if (num != 0) return -1;
+  if (num != 0) {
+    return -1;
+  }
   HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
   if (handle == INVALID_HANDLE_VALUE) {
     return -1;
   }
   StdHandle* std_handle = new StdHandle(handle);
   std_handle->MarkDoesNotSupportOverlappedIO();
   std_handle->EnsureInitialized(EventHandler::delegate());
   return reinterpret_cast<intptr_t>(std_handle);
 }
 
@@ skipping 31 matching lines @@
   }
   if (status != 0) {
     ASSERT(*os_error == NULL);
     DWORD error_code = WSAGetLastError();
     SetLastError(error_code);
     *os_error = new OSError();
     return NULL;
   }
   intptr_t count = 0;
   for (struct addrinfo* c = info; c != NULL; c = c->ai_next) {
-    if (c->ai_family == AF_INET || c->ai_family == AF_INET6) count++;
+    if ((c->ai_family == AF_INET) || (c->ai_family == AF_INET6)) {
+      count++;
+    }
   }
   AddressList<SocketAddress>* addresses = new AddressList<SocketAddress>(count);
   intptr_t i = 0;
   for (struct addrinfo* c = info; c != NULL; c = c->ai_next) {
-    if (c->ai_family == AF_INET || c->ai_family == AF_INET6) {
+    if ((c->ai_family == AF_INET) || (c->ai_family == AF_INET6)) {
       addresses->SetAt(i, new SocketAddress(c->ai_addr));
       i++;
     }
   }
   freeaddrinfo(info);
   return addresses;
 }
 
 
 bool Socket::ReverseLookup(const RawAddr& addr,
@@ skipping 47 matching lines @@
                         reinterpret_cast<const char*>(&optval),
                         sizeof(optval));
     if (status == SOCKET_ERROR) {
       DWORD rc = WSAGetLastError();
       closesocket(s);
       SetLastError(rc);
       return -1;
     }
   }
 
-  status = bind(s,
-                &addr.addr,
-                SocketAddress::GetAddrLength(addr));
+  status = bind(s, &addr.addr,  SocketAddress::GetAddrLength(addr));
   if (status == SOCKET_ERROR) {
     DWORD rc = WSAGetLastError();
     closesocket(s);
     SetLastError(rc);
     return -1;
   }
 
   DatagramSocket* datagram_socket = new DatagramSocket(s);
   datagram_socket->EnsureInitialized(EventHandler::delegate());
   return reinterpret_cast<intptr_t>(datagram_socket);
@@ skipping 80 matching lines @@
 
   if (addr.ss.ss_family == AF_INET6) {
     optval = v6_only;
     setsockopt(s,
                IPPROTO_IPV6,
                IPV6_V6ONLY,
                reinterpret_cast<const char*>(&optval),
                sizeof(optval));
   }
 
-  status = bind(s,
-                &addr.addr,
-                SocketAddress::GetAddrLength(addr));
+  status = bind(s, &addr.addr, SocketAddress::GetAddrLength(addr));
   if (status == SOCKET_ERROR) {
     DWORD rc = WSAGetLastError();
     closesocket(s);
     SetLastError(rc);
     return -1;
   }
 
   ListenSocket* listen_socket = new ListenSocket(s);
 
   // Test for invalid socket port 65535 (some browsers disallow it).
-  if (SocketAddress::GetAddrPort(addr) == 0 &&
-      Socket::GetPort(reinterpret_cast<intptr_t>(listen_socket)) == 65535) {
+  if ((SocketAddress::GetAddrPort(addr) == 0) &&
+      (Socket::GetPort(reinterpret_cast<intptr_t>(listen_socket)) == 65535)) {
     // Don't close fd until we have created new. By doing that we ensure another
     // port.
     intptr_t new_s = CreateBindListen(addr, backlog, v6_only);
     DWORD rc = WSAGetLastError();
     closesocket(s);
     delete listen_socket;
     SetLastError(rc);
     return new_s;
   }
 
@@ skipping 40 matching lines @@
 bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
   SocketHandle* handle = reinterpret_cast<SocketHandle*>(fd);
   int on;
   socklen_t len = sizeof(on);
   int err = getsockopt(handle->socket(),
                        IPPROTO_TCP,
                        TCP_NODELAY,
                        reinterpret_cast<char *>(&on),
                        &len);
   if (err == 0) {
-    *enabled = on == 1;
+    *enabled = (on == 1);
   }
-  return err == 0;
+  return (err == 0);
 }
 
 
 bool Socket::SetNoDelay(intptr_t fd, bool enabled) {
   SocketHandle* handle = reinterpret_cast<SocketHandle*>(fd);
   int on = enabled ? 1 : 0;
   return setsockopt(handle->socket(),
                     IPPROTO_TCP,
                     TCP_NODELAY,
                     reinterpret_cast<char *>(&on),
@@ skipping 24 matching lines @@
   SocketHandle* handle = reinterpret_cast<SocketHandle*>(fd);
   int on = enabled ? 1 : 0;
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
   int optname = protocol == SocketAddress::TYPE_IPV4
       ? IP_MULTICAST_LOOP : IPV6_MULTICAST_LOOP;
   return setsockopt(handle->socket(),
                     level,
                     optname,
                     reinterpret_cast<char *>(&on),
                     sizeof(on)) == 0;
-  return false;
 }
 
 
 bool Socket::GetMulticastHops(intptr_t fd, intptr_t protocol, int* value) {
   SocketHandle* handle = reinterpret_cast<SocketHandle*>(fd);
   uint8_t v;
   socklen_t len = sizeof(v);
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
   int optname = protocol == SocketAddress::TYPE_IPV4
       ? IP_MULTICAST_TTL : IPV6_MULTICAST_HOPS;
@@ skipping 26 matching lines @@
 bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
   SocketHandle* handle = reinterpret_cast<SocketHandle*>(fd);
   int on;
   socklen_t len = sizeof(on);
   int err = getsockopt(handle->socket(),
                        SOL_SOCKET,
                        SO_BROADCAST,
                        reinterpret_cast<char *>(&on),
                        &len);
   if (err == 0) {
-    *enabled = on == 1;
+    *enabled = (on == 1);
   }
-  return err == 0;
+  return (err == 0);
 }
 
 
 bool Socket::SetBroadcast(intptr_t fd, bool enabled) {
   SocketHandle* handle = reinterpret_cast<SocketHandle*>(fd);
   int on = enabled ? 1 : 0;
   return setsockopt(handle->socket(),
                     SOL_SOCKET,
                     SO_BROADCAST,
                     reinterpret_cast<char *>(&on),
@@ skipping 27 matching lines @@
                     proto,
                     MCAST_LEAVE_GROUP,
                     reinterpret_cast<char *>(&mreq),
                     sizeof(mreq)) == 0;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)