[haiku-commits] r37437 - in haiku/trunk/src: apps/aboutsystem kits/network/libnetapi
- From: philippe.houdoin@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 9 Jul 2010 02:24:19 +0200 (CEST)
Author: phoudoin
Date: 2010-07-09 02:24:18 +0200 (Fri, 09 Jul 2010)
New Revision: 37437
Changeset: http://dev.haiku-os.org/changeset/37437/haiku
Modified:
haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
haiku/trunk/src/kits/network/libnetapi/DynamicBuffer.cpp
haiku/trunk/src/kits/network/libnetapi/NetEndpoint.cpp
Log:
Fixed Size() and BytesRemaining() semantics, which was broken.
Revert r33437, which was missing the root cause.
Spotted by Christophe Huriaux, thanks.
And welcome in contributors list!
Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp 2010-07-08 18:18:05 UTC
(rev 37436)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp 2010-07-09 00:24:18 UTC
(rev 37437)
@@ -990,6 +990,7 @@
"Matthijs Hollemans\n"
"Mathew Hounsell\n"
"Morgan Howe\n"
+ "Christophe Huriaux\n"
"Ma Jie\n"
"Carwyn Jones\n"
"Vasilis Kaoutsis\n"
Modified: haiku/trunk/src/kits/network/libnetapi/DynamicBuffer.cpp
===================================================================
--- haiku/trunk/src/kits/network/libnetapi/DynamicBuffer.cpp 2010-07-08
18:18:05 UTC (rev 37436)
+++ haiku/trunk/src/kits/network/libnetapi/DynamicBuffer.cpp 2010-07-09
00:24:18 UTC (rev 37437)
@@ -115,14 +115,14 @@
size_t
DynamicBuffer::Size() const
{
- return fBufferSize;
+ return fDataEnd - fDataStart;
}
size_t
DynamicBuffer::BytesRemaining() const
{
- return fDataEnd - fDataStart;
+ return fBufferSize -fDataEnd;
}
Modified: haiku/trunk/src/kits/network/libnetapi/NetEndpoint.cpp
===================================================================
--- haiku/trunk/src/kits/network/libnetapi/NetEndpoint.cpp 2010-07-08
18:18:05 UTC (rev 37436)
+++ haiku/trunk/src/kits/network/libnetapi/NetEndpoint.cpp 2010-07-09
00:24:18 UTC (rev 37437)
@@ -555,7 +555,7 @@
int32
BNetEndpoint::Send(BNetBuffer& buffer, int flags)
{
- return Send(buffer.Data(), buffer.BytesRemaining(), flags);
+ return Send(buffer.Data(), buffer.Size(), flags);
}
@@ -583,7 +583,7 @@
BNetEndpoint::SendTo(BNetBuffer& buffer,
const BNetAddress& address, int flags)
{
- return SendTo(buffer.Data(), buffer.BytesRemaining(), address, flags);
+ return SendTo(buffer.Data(), buffer.Size(), address, flags);
}
Other related posts:
