dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
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;
}