Browse Source

Cleaned up calls to setsockopt

Paul-Louis Ageneau 3 years ago
parent
commit
9c2945a3d7
2 changed files with 4 additions and 4 deletions
  1. 2 2
      src/impl/tcpserver.cpp
  2. 2 2
      src/impl/tcptransport.cpp

+ 2 - 2
src/impl/tcpserver.cpp

@@ -133,8 +133,8 @@ void TcpServer::listen(uint16_t port) {
 		// Listen on both IPv6 and IPv4
 		const sockopt_t disabled = 0;
 		if (ai->ai_family == AF_INET6)
-			::setsockopt(mSock, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&disabled,
-			             sizeof(disabled));
+			::setsockopt(mSock, IPPROTO_IPV6, IPV6_V6ONLY,
+			             reinterpret_cast<const char *>(&disabled), sizeof(disabled));
 
 		// Set non-blocking
 		ctl_t b = 1;

+ 2 - 2
src/impl/tcptransport.cpp

@@ -188,8 +188,8 @@ void TcpTransport::connect(const sockaddr *addr, socklen_t addrlen) {
 
 #ifdef __APPLE__
 		// MacOS lacks MSG_NOSIGNAL and requires SO_NOSIGPIPE instead
-		int opt = 1;
-		if (::setsockopt(mSock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)) < 0)
+		const sockopt_t enabled = 1;
+		if (::setsockopt(mSock, SOL_SOCKET, SO_NOSIGPIPE, &enabled, sizeof(enabled)) < 0)
 			throw std::runtime_error("Failed to disable SIGPIPE for socket");
 #endif