diff options
author | Kahrl <kahrl@gmx.net> | 2011-11-07 04:20:33 +0100 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-07 11:21:42 +0200 |
commit | 1c98ec94da18c97272e1b0a2c1e43baf0683a187 (patch) | |
tree | 9351db1279247e48303fb021323e4e3428f9a42b /src/client.cpp | |
parent | 28660b4c1af1b1b6ac2d3fda6984bda2a1199dc1 (diff) | |
download | minetest-1c98ec94da18c97272e1b0a2c1e43baf0683a187.tar.gz minetest-1c98ec94da18c97272e1b0a2c1e43baf0683a187.tar.bz2 minetest-1c98ec94da18c97272e1b0a2c1e43baf0683a187.zip |
Make Connection::Receive return the data via a SharedBuffer reference, so the caller doesn't have to choose the right buffer size in advance.
Conflicts:
src/test.cpp
Diffstat (limited to 'src/client.cpp')
-rw-r--r-- | src/client.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/client.cpp b/src/client.cpp index a777293a3..69c91bc30 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -665,14 +665,13 @@ void Client::ReceiveAll() void Client::Receive() { DSTACK(__FUNCTION_NAME); - u32 data_maxsize = 200000; - Buffer<u8> data(data_maxsize); + SharedBuffer<u8> data; u16 sender_peer_id; u32 datasize; { //TimeTaker t1("con mutex and receive", m_device); //JMutexAutoLock lock(m_con_mutex); //bulk comment-out - datasize = m_con.Receive(sender_peer_id, *data, data_maxsize); + datasize = m_con.Receive(sender_peer_id, data); } //TimeTaker t1("ProcessData", m_device); ProcessData(*data, datasize, sender_peer_id); |