Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small cleanup, use get_node_at_offset().

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20591 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Hugo Santos 2007-04-05 20:45:10 +00:00
parent 4168e54af8
commit a5d8483183
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/add-ons/kernel/network/stack/net_buffer.cpp
View File

@ -240,6 +240,20 @@ remove_data_node(data_node *node)
} }
static inline data_node *
get_node_at_offset(net_buffer_private *buffer, size_t offset)
{
data_node *node = (data_node *)list_get_first_item(&buffer->buffers);
while (node->offset + node->used < offset) {
node = (data_node *)list_get_next_item(&buffer->buffers, node);
if (node == NULL)
return NULL;
}
return node;
}
// #pragma mark - // #pragma mark -
@ -528,19 +542,6 @@ merge_buffer(net_buffer *_buffer, net_buffer *_with, bool after)
} }
static inline data_node *
get_node_at_offset(net_buffer_private *buffer, size_t offset)
{
data_node *node = (data_node *)list_get_first_item(&buffer->buffers);
while (node->offset + node->used < offset) {
node = (data_node *)list_get_next_item(&buffer->buffers, node);
if (node == NULL)
return NULL;
}
return node;
}
/*! Writes into existing allocated memory. /*! Writes into existing allocated memory.
\return B_BAD_VALUE if you write outside of the buffers current \return B_BAD_VALUE if you write outside of the buffers current
bounds. bounds.
@ -870,13 +871,10 @@ trim_data(net_buffer *_buffer, size_t newSize)
if (newSize == buffer->size) if (newSize == buffer->size)
return B_OK; return B_OK;
data_node *node = (data_node *)list_get_first_item(&buffer->buffers); data_node *node = get_node_at_offset(buffer, newSize);
while (node->offset + node->used < newSize) { if (node == NULL) {
node = (data_node *)list_get_next_item(&buffer->buffers, node); // trim size greater than buffer size
if (node == NULL) { return B_BAD_VALUE;
// trim size greater than buffer size
return B_BAD_VALUE;
}
} }
int32 diff = node->used + node->offset - newSize; int32 diff = node->used + node->offset - newSize;