From e57552d401276b9be432d5ccee7fb2e85949250c Mon Sep 17 00:00:00 2001 From: goldsimon Date: Tue, 25 Apr 2017 22:01:42 +0200 Subject: [PATCH] pbuf_alloc_copy -> pbuf_clone --- src/core/pbuf.c | 2 +- src/include/lwip/opt.h | 4 ++-- src/include/lwip/pbuf.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/pbuf.c b/src/core/pbuf.c index 202d7de7..28fe48e3 100644 --- a/src/core/pbuf.c +++ b/src/core/pbuf.c @@ -1332,7 +1332,7 @@ pbuf_coalesce(struct pbuf *p, pbuf_layer layer) * @return a new pbuf or NULL if allocation fails */ struct pbuf * -pbuf_alloc_copy(pbuf_layer layer, pbuf_type type, struct pbuf *p) +pbuf_clone(pbuf_layer layer, pbuf_type type, struct pbuf *p) { struct pbuf *q; err_t err; diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h index f14cfdbb..17e92d74 100644 --- a/src/include/lwip/opt.h +++ b/src/include/lwip/opt.h @@ -1521,10 +1521,10 @@ * be needed without this flag! Use this only if you need to! * * ATTENTION: a driver should *NOT* rely on getting single pbufs but check TX - * pbufs for being in one piece. If not, @ref pbuf_alloc_copy can be used to get + * pbufs for being in one piece. If not, @ref pbuf_clone can be used to get * a single pbuf: * if (p->next != NULL) { - * struct pbuf *q = pbuf_alloc_copy(PBUF_RAW, PBUF_RAM, p); + * struct pbuf *q = pbuf_clone(PBUF_RAW, PBUF_RAM, p); * if (q == NULL) { * return ERR_MEM; * } diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h index 52a4f1fe..0f3c18d1 100644 --- a/src/include/lwip/pbuf.h +++ b/src/include/lwip/pbuf.h @@ -262,7 +262,7 @@ err_t pbuf_take(struct pbuf *buf, const void *dataptr, u16_t len); err_t pbuf_take_at(struct pbuf *buf, const void *dataptr, u16_t len, u16_t offset); struct pbuf *pbuf_skip(struct pbuf* in, u16_t in_offset, u16_t* out_offset); struct pbuf *pbuf_coalesce(struct pbuf *p, pbuf_layer layer); -struct pbuf *pbuf_alloc_copy(pbuf_layer l, pbuf_type type, struct pbuf *p); +struct pbuf *pbuf_clone(pbuf_layer l, pbuf_type type, struct pbuf *p); #if LWIP_CHECKSUM_ON_COPY err_t pbuf_fill_chksum(struct pbuf *p, u16_t start_offset, const void *dataptr, u16_t len, u16_t *chksum);