mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 06:23:04 +01:00
Code Issues Releases Wiki Activity

Close #12426: Refactor NETWORK_READPACKET to use strong enum (#12807)

Browse Source 
Replacing enum NETWORK_READPACKET with enum class NetworkReadPacket.
This commit is contained in:
Julia Pinheiro
2020-08-31 09:13:15 -03:00
committed by GitHub
parent e9803fc4b5
commit dafde532af
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/network/Socket.cpp
View File

@@ -494,7 +494,7 @@ public:
return totalSent;
}
NETWORK_READPACKET ReceiveData(void* buffer, size_t size, size_t* sizeReceived) override
NetworkReadPacket ReceiveData(void* buffer, size_t size, size_t* sizeReceived) override
{
if (_status != SOCKET_STATUS_CONNECTED)
{
@@ -505,7 +505,7 @@ public:
if (readBytes == 0)
{
*sizeReceived = 0;
return NETWORK_READPACKET_DISCONNECTED;
return NetworkReadPacket::Disconnected;
}
else if (readBytes == SOCKET_ERROR)
{
@@ -524,17 +524,17 @@ public:
# endif // _WIN32
if (LAST_SOCKET_ERROR() != EWOULDBLOCK)
{
return NETWORK_READPACKET_DISCONNECTED;
return NetworkReadPacket::Disconnected;
}
else
{
return NETWORK_READPACKET_NO_DATA;
return NetworkReadPacket::NoData;
}
}
else
{
*sizeReceived = readBytes;
return NETWORK_READPACKET_SUCCESS;
return NetworkReadPacket::Success;
}
}
@@ -720,7 +720,7 @@ public:
return totalSent;
}
NETWORK_READPACKET ReceiveData(
NetworkReadPacket ReceiveData(
void* buffer, size_t size, size_t* sizeReceived, std::unique_ptr<INetworkEndpoint>* sender) override
{
sockaddr_in senderAddr{};
@@ -736,7 +736,7 @@ public:
if (readBytes <= 0)
{
*sizeReceived = 0;
return NETWORK_READPACKET_NO_DATA;
return NetworkReadPacket::NoData;
}
else
{
@@ -745,7 +745,7 @@ public:
{
*sender = std::make_unique<NetworkEndpoint>(reinterpret_cast<sockaddr*>(&senderAddr), senderAddrLen);
}
return NETWORK_READPACKET_SUCCESS;
return NetworkReadPacket::Success;
}
}