* Minor cleanup.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29870 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1074,7 +1074,7 @@ duplicate_buffer(net_buffer *_buffer)
|
|||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
TRACE(("%ld: duplicate: %p)\n", find_thread(NULL), duplicate));
|
TRACE(("%ld: duplicate: %p)\n", find_thread(NULL), duplicate));
|
||||||
|
|
||||||
// copy the data from the source buffer
|
// copy the data from the source buffer
|
||||||
|
|
||||||
data_node *node = (data_node *)list_get_first_item(&buffer->buffers);
|
data_node *node = (data_node *)list_get_first_item(&buffer->buffers);
|
||||||
@@ -1310,9 +1310,10 @@ merge_buffer(net_buffer *_buffer, net_buffer *_with, bool after)
|
|||||||
} else {
|
} else {
|
||||||
// we need a new place for this node
|
// we need a new place for this node
|
||||||
data_node *newNode = add_data_node(buffer, node->header);
|
data_node *newNode = add_data_node(buffer, node->header);
|
||||||
if (newNode == NULL)
|
if (newNode == NULL) {
|
||||||
// TODO: try to revert buffers to their initial state!!
|
// TODO: try to revert buffers to their initial state!!
|
||||||
return ENOBUFS;
|
return ENOBUFS;
|
||||||
|
}
|
||||||
|
|
||||||
last = node;
|
last = node;
|
||||||
*newNode = *node;
|
*newNode = *node;
|
||||||
@@ -1502,7 +1503,7 @@ prepend_size(net_buffer *_buffer, size_t size, void **_contiguousBuffer)
|
|||||||
if (_contiguousBuffer)
|
if (_contiguousBuffer)
|
||||||
*_contiguousBuffer = node->start;
|
*_contiguousBuffer = node->start;
|
||||||
|
|
||||||
// adjust offset of following nodes
|
// adjust offset of following nodes
|
||||||
while ((node = (data_node *)list_get_next_item(&buffer->buffers, node)) != NULL) {
|
while ((node = (data_node *)list_get_next_item(&buffer->buffers, node)) != NULL) {
|
||||||
node->offset += size;
|
node->offset += size;
|
||||||
}
|
}
|
||||||
@@ -1701,7 +1702,7 @@ remove_header(net_buffer *_buffer, size_t bytes)
|
|||||||
node = (data_node *)list_get_next_item(&buffer->buffers, node);
|
node = (data_node *)list_get_next_item(&buffer->buffers, node);
|
||||||
}
|
}
|
||||||
|
|
||||||
// adjust offset of following nodes
|
// adjust offset of following nodes
|
||||||
while (node != NULL) {
|
while (node != NULL) {
|
||||||
node->offset -= bytes;
|
node->offset -= bytes;
|
||||||
node = (data_node *)list_get_next_item(&buffer->buffers, node);
|
node = (data_node *)list_get_next_item(&buffer->buffers, node);
|
||||||
|
|||||||
Reference in New Issue
Block a user