i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Got rid of _SocketEnqueue().

Browse Source 
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37867 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-03 11:19:22 +00:00
parent e4f401b349
commit 690acf8bd2
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/net/ProtocolUtilities.h
+5 -11
View File
@@ -133,7 +133,6 @@ protected:
private: private:
status_t _Enqueue(net_buffer* buffer); status_t _Enqueue(net_buffer* buffer);
status_t _SocketEnqueue(net_buffer* buffer);
net_buffer* _Dequeue(bool peek); net_buffer* _Dequeue(bool peek);
void _Clear(); void _Clear();
@@ -212,37 +211,32 @@ DECL_DATAGRAM_SOCKET(inline status_t)::_Enqueue(net_buffer* buffer)
DECL_DATAGRAM_SOCKET(inline status_t)::SocketEnqueue(net_buffer* _buffer) DECL_DATAGRAM_SOCKET(inline status_t)::SocketEnqueue(net_buffer* _buffer)
{ {
AutoLocker _(fLock); AutoLocker _(fLock);
return _SocketEnqueue(_buffer);
}
DECL_DATAGRAM_SOCKET(inline status_t)::_SocketEnqueue(net_buffer* _buffer)
{
net_buffer* buffer = ModuleBundle::Buffer()->clone(_buffer, false); net_buffer* buffer = ModuleBundle::Buffer()->clone(_buffer, false);
if (buffer == NULL) if (buffer == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
status_t status = _Enqueue(buffer); status_t status = _Enqueue(buffer);
if (status < B_OK) if (status != B_OK)
ModuleBundle::Buffer()->free(buffer); ModuleBundle::Buffer()->free(buffer);
return status; return status;
} }
DECL_DATAGRAM_SOCKET(inline net_buffer*)::Dequeue(bool clone) DECL_DATAGRAM_SOCKET(inline net_buffer*)::Dequeue(bool peek)
{ {
AutoLocker _(fLock); AutoLocker _(fLock);
return _Dequeue(clone); return _Dequeue(peek);
} }
DECL_DATAGRAM_SOCKET(inline net_buffer*)::_Dequeue(bool clone) DECL_DATAGRAM_SOCKET(inline net_buffer*)::_Dequeue(bool peek)
{ {
if (fBuffers.IsEmpty()) if (fBuffers.IsEmpty())
return NULL; return NULL;
if (clone) if (peek)
return ModuleBundle::Buffer()->clone(fBuffers.Head(), false); return ModuleBundle::Buffer()->clone(fBuffers.Head(), false);
net_buffer* buffer = fBuffers.RemoveHead(); net_buffer* buffer = fBuffers.RemoveHead();