Index: runtime/bin/socket_win.cc |
diff --git a/runtime/bin/socket_win.cc b/runtime/bin/socket_win.cc |
index 30bdc44d2f06a06925978b0d2e423939e93d7818..ea306b7282740c38adc21c88155b958879bd8860 100644 |
--- a/runtime/bin/socket_win.cc |
+++ b/runtime/bin/socket_win.cc |
@@ -54,7 +54,9 @@ 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); |
@@ -64,7 +66,7 @@ bool Socket::Initialize() { |
} else { |
Log::PrintErr("Unable to initialize Winsock: %d\n", WSAGetLastError()); |
} |
- return err == 0; |
+ return (err == 0); |
} |
intptr_t Socket::Available(intptr_t fd) { |
@@ -107,9 +109,7 @@ intptr_t Socket::GetPort(intptr_t fd) { |
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); |
@@ -121,9 +121,7 @@ SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) { |
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); |
@@ -268,7 +266,9 @@ int Socket::GetType(intptr_t fd) { |
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; |
@@ -320,12 +320,14 @@ AddressList<SocketAddress>* Socket::LookupAddress(const char* host, |
} |
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++; |
} |
@@ -393,9 +395,7 @@ intptr_t Socket::CreateBindDatagram(const RawAddr& addr, bool reuseAddress) { |
} |
} |
- 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); |
@@ -496,9 +496,7 @@ intptr_t ServerSocket::CreateBindListen(const RawAddr& addr, |
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); |
@@ -509,8 +507,8 @@ intptr_t ServerSocket::CreateBindListen(const RawAddr& addr, |
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); |
@@ -571,9 +569,9 @@ bool Socket::GetNoDelay(intptr_t fd, bool* enabled) { |
reinterpret_cast<char *>(&on), |
&len); |
if (err == 0) { |
- *enabled = on == 1; |
+ *enabled = (on == 1); |
} |
- return err == 0; |
+ return (err == 0); |
} |
@@ -618,7 +616,6 @@ bool Socket::SetMulticastLoop(intptr_t fd, intptr_t protocol, bool enabled) { |
optname, |
reinterpret_cast<char *>(&on), |
sizeof(on)) == 0; |
- return false; |
} |
@@ -665,9 +662,9 @@ bool Socket::GetBroadcast(intptr_t fd, bool* enabled) { |
reinterpret_cast<char *>(&on), |
&len); |
if (err == 0) { |
- *enabled = on == 1; |
+ *enabled = (on == 1); |
} |
- return err == 0; |
+ return (err == 0); |
} |