mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r17742) -Codechange: remove unused variable from Recv_Packet

This commit is contained in:
rubidium 2009-10-07 20:58:14 +00:00
parent 8c37da1be6
commit df75db67eb
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/core/tcp.cpp
View File

@ -131,13 +131,11 @@ bool NetworkTCPSocketHandler::Send_Packets()
* @param status the variable to store the status into
* @return the received packet (or NULL when it didn't receive one)
*/
Packet *NetworkTCPSocketHandler::Recv_Packet(NetworkRecvStatus *status)
Packet *NetworkTCPSocketHandler::Recv_Packet()
{
ssize_t res;
Packet *p;
*status = NETWORK_RECV_STATUS_OKAY;
if (!this->IsConnected()) return NULL;
if (this->packet_recv == NULL) {
@ -157,7 +155,7 @@ Packet *NetworkTCPSocketHandler::Recv_Packet(NetworkRecvStatus *status)
if (err != EWOULDBLOCK) {
/* Something went wrong... (104 is connection reset by peer) */
if (err != 104) DEBUG(net, 0, "recv failed with error %d", err);
*status = this->CloseConnection();
this->CloseConnection();
return NULL;
}
/* Connection would block, so stop for now */
@ -165,7 +163,7 @@ Packet *NetworkTCPSocketHandler::Recv_Packet(NetworkRecvStatus *status)
}
if (res == 0) {
/* Client/server has left */
*status = this->CloseConnection();
this->CloseConnection();
return NULL;
}
p->pos += res;
@ -175,7 +173,7 @@ Packet *NetworkTCPSocketHandler::Recv_Packet(NetworkRecvStatus *status)
p->ReadRawPacketSize();
if (p->size > SEND_MTU) {
*status = this->CloseConnection();
this->CloseConnection();
return NULL;
}
}
@ -188,7 +186,7 @@ Packet *NetworkTCPSocketHandler::Recv_Packet(NetworkRecvStatus *status)
if (err != EWOULDBLOCK) {
/* Something went wrong... (104 is connection reset by peer) */
if (err != 104) DEBUG(net, 0, "recv failed with error %d", err);
*status = this->CloseConnection();
this->CloseConnection();
return NULL;
}
/* Connection would block */
@ -196,7 +194,7 @@ Packet *NetworkTCPSocketHandler::Recv_Packet(NetworkRecvStatus *status)
}
if (res == 0) {
/* Client/server has left */
*status = this->CloseConnection();
this->CloseConnection();
return NULL;
}

2
src/network/core/tcp.h
View File

@ -41,7 +41,7 @@ public:
bool Send_Packets();
bool IsPacketQueueEmpty();
Packet *Recv_Packet(NetworkRecvStatus *status);
Packet *Recv_Packet();
NetworkTCPSocketHandler(SOCKET s = INVALID_SOCKET);
~NetworkTCPSocketHandler();

3
src/network/core/tcp_content.cpp
View File

@ -105,8 +105,7 @@ bool NetworkContentSocketHandler::HandlePacket(Packet *p)
void NetworkContentSocketHandler::Recv_Packets()
{
Packet *p;
NetworkRecvStatus res;
while ((p = this->Recv_Packet(&res)) != NULL) {
while ((p = this->Recv_Packet()) != NULL) {
bool cont = HandlePacket(p);
delete p;
if (!cont) return;

2
src/network/network_client.cpp
View File

@ -952,7 +952,7 @@ NetworkRecvStatus NetworkClient_ReadPackets(NetworkClientSocket *cs)
Packet *p;
NetworkRecvStatus res = NETWORK_RECV_STATUS_OKAY;
while (res == NETWORK_RECV_STATUS_OKAY && (p = cs->Recv_Packet(&res)) != NULL) {
while (res == NETWORK_RECV_STATUS_OKAY && (p = cs->Recv_Packet()) != NULL) {
byte type = p->Recv_uint8();
if (type < PACKET_END && _network_client_packet[type] != NULL && !MY_CLIENT->HasClientQuit()) {
res = _network_client_packet[type](p);

2
src/network/network_server.cpp
View File

@ -1567,7 +1567,7 @@ void NetworkServer_ReadPackets(NetworkClientSocket *cs)
{
Packet *p;
NetworkRecvStatus res;
while ((p = cs->Recv_Packet(&res)) != NULL) {
while ((p = cs->Recv_Packet()) != NULL) {
byte type = p->Recv_uint8();
if (type < PACKET_END && _network_server_packet[type] != NULL && !cs->HasClientQuit()) {
res = _network_server_packet[type](cs, p);