* BugFix: Clear some MSVC compiler warnings.

This commit is contained in:
Robert MacGregor 2021-10-07 00:27:39 -04:00
parent 026409ed7f
commit 5d26dba7da
23 changed files with 24 additions and 111 deletions

View file

@ -95,36 +95,6 @@ typedef int SOCKET;
#endif
#if defined(TORQUE_USE_WINSOCK)
static const char* strerror_wsa( S32 code )
{
switch( code )
{
#define E( name ) case name: return #name;
E( WSANOTINITIALISED );
E( WSAENETDOWN );
E( WSAEADDRINUSE );
E( WSAEINPROGRESS );
E( WSAEALREADY );
E( WSAEADDRNOTAVAIL );
E( WSAEAFNOSUPPORT );
E( WSAEFAULT );
E( WSAEINVAL );
E( WSAEISCONN );
E( WSAENETUNREACH );
E( WSAEHOSTUNREACH );
E( WSAENOBUFS );
E( WSAENOTSOCK );
E( WSAETIMEDOUT );
E( WSAEWOULDBLOCK );
E( WSAEACCES );
#undef E
default:
return "Unknown";
}
}
#endif
#include "core/util/tVector.h"
#include "platform/platformNetAsync.h"
#include "console/console.h"
@ -1243,7 +1213,8 @@ void Net::process()
}
break;
case PolledSocket::NameLookupRequired:
U32 newState;
{
U32 newState = Net::NoError;
// is the lookup complete?
if (!gNetAsync.checkLookup(
@ -1262,7 +1233,7 @@ void Net::process()
{
// try to connect
out_h_addr.port = currentSock->remotePort;
const sockaddr *ai_addr = NULL;
const sockaddr* ai_addr = NULL;
int ai_addrlen = 0;
sockaddr_in socketAddress;
sockaddr_in6 socketAddress6;
@ -1304,7 +1275,7 @@ void Net::process()
else
{
Con::errorf("Error connecting to %s: Invalid Protocol",
currentSock->remoteAddr);
currentSock->remoteAddr);
newState = Net::ConnectFailed;
removeSock = true;
removeSockHandle = currentSock->handleFd;
@ -1319,7 +1290,7 @@ void Net::process()
if (err != Net::WouldBlock)
{
Con::errorf("Error connecting to %s: %u",
currentSock->remoteAddr, err);
currentSock->remoteAddr, err);
newState = Net::ConnectFailed;
removeSock = true;
removeSockHandle = currentSock->handleFd;
@ -1340,6 +1311,7 @@ void Net::process()
smConnectionNotify->trigger(currentSock->handleFd, newState);
break;
}
case PolledSocket::Listening:
NetAddress incomingAddy;