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

(svn r17746) -Codechange: 'operator new' doesn't return NULL, NetworkSend_Init() is useless

Browse Source
This commit is contained in:
smatz
2009-10-09 11:03:00 +00:00
parent 33f2700c36
commit c2c23ec661
5 changed files with 40 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,20 +47,6 @@ Packet::Packet(PacketType type)
this->buffer[this->size++] = type;
}
/**
* Create a packet for sending
* @param type the of packet
* @return the newly created packet
*/
Packet *NetworkSend_Init(PacketType type)
{
Packet *packet = new Packet(type);
/* An error is inplace here, because it simply means we ran out of memory. */
if (packet == NULL) error("Failed to allocate Packet");
return packet;
}
/**
* Writes the packet size from the raw packet from packet->size
*/

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

@@ -72,8 +72,6 @@ public:
void Recv_string(char *buffer, size_t size, bool allow_newlines = false);
};
Packet *NetworkSend_Init(PacketType type);
#endif /* ENABLE_NETWORK */
#endif /* NETWORK_CORE_PACKET_H */

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

@@ -134,16 +134,14 @@ bool NetworkTCPSocketHandler::Send_Packets()
Packet *NetworkTCPSocketHandler::Recv_Packet()
{
ssize_t res;
Packet *p;
if (!this->IsConnected()) return NULL;
if (this->packet_recv == NULL) {
this->packet_recv = new Packet(this);
if (this->packet_recv == NULL) error("Failed to allocate packet");
}
p = this->packet_recv;
Packet *p = this->packet_recv;
/* Read packet size */
if (p->pos < sizeof(PacketSize)) {