From 690acf8bd2246f865df87cbb266c0a78f7f6d3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 3 Aug 2010 11:19:22 +0000 Subject: [PATCH] * Got rid of _SocketEnqueue(). * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37867 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/net/ProtocolUtilities.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/headers/private/net/ProtocolUtilities.h b/headers/private/net/ProtocolUtilities.h index f418bbb45c..271169d808 100644 --- a/headers/private/net/ProtocolUtilities.h +++ b/headers/private/net/ProtocolUtilities.h @@ -133,7 +133,6 @@ protected: private: status_t _Enqueue(net_buffer* buffer); - status_t _SocketEnqueue(net_buffer* buffer); net_buffer* _Dequeue(bool peek); 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) { AutoLocker _(fLock); - return _SocketEnqueue(_buffer); -} - -DECL_DATAGRAM_SOCKET(inline status_t)::_SocketEnqueue(net_buffer* _buffer) -{ net_buffer* buffer = ModuleBundle::Buffer()->clone(_buffer, false); if (buffer == NULL) return B_NO_MEMORY; status_t status = _Enqueue(buffer); - if (status < B_OK) + if (status != B_OK) ModuleBundle::Buffer()->free(buffer); return status; } -DECL_DATAGRAM_SOCKET(inline net_buffer*)::Dequeue(bool clone) +DECL_DATAGRAM_SOCKET(inline net_buffer*)::Dequeue(bool peek) { 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()) return NULL; - if (clone) + if (peek) return ModuleBundle::Buffer()->clone(fBuffers.Head(), false); net_buffer* buffer = fBuffers.RemoveHead();