mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2025-01-30 03:32:50 +00:00
pbuf_coalesce: Replace pbuf_alloc+pbuf_copy with pbuf_clone
Avoid duplicate the same implementation. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: goldsimon <goldsimon@gmx.de>
This commit is contained in:
parent
bc0fafdeca
commit
c144e5b1ec
@ -1262,18 +1262,14 @@ struct pbuf*
|
|||||||
pbuf_coalesce(struct pbuf *p, pbuf_layer layer)
|
pbuf_coalesce(struct pbuf *p, pbuf_layer layer)
|
||||||
{
|
{
|
||||||
struct pbuf *q;
|
struct pbuf *q;
|
||||||
err_t err;
|
|
||||||
if (p->next == NULL) {
|
if (p->next == NULL) {
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
q = pbuf_alloc(layer, p->tot_len, PBUF_RAM);
|
q = pbuf_clone(layer, PBUF_RAM, p);
|
||||||
if (q == NULL) {
|
if (q == NULL) {
|
||||||
/* @todo: what do we do now? */
|
/* @todo: what do we do now? */
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
err = pbuf_copy(q, p);
|
|
||||||
LWIP_UNUSED_ARG(err); /* in case of LWIP_NOASSERT */
|
|
||||||
LWIP_ASSERT("pbuf_copy failed", err == ERR_OK);
|
|
||||||
pbuf_free(p);
|
pbuf_free(p);
|
||||||
return q;
|
return q;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user