pbuf_alloced_custom(): less code duplication, please :-)

This commit is contained in:
goldsimon 2017-06-14 21:39:53 +02:00
parent 3073affaaf
commit 67d1970059

View File

@ -387,6 +387,7 @@ pbuf_alloced_custom(pbuf_layer l, u16_t length, pbuf_type type, struct pbuf_cust
void *payload_mem, u16_t payload_mem_len) void *payload_mem, u16_t payload_mem_len)
{ {
u16_t offset; u16_t offset;
void *payload;
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloced_custom(length=%"U16_F")\n", length)); LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloced_custom(length=%"U16_F")\n", length));
/* determine header offset */ /* determine header offset */
@ -421,11 +422,11 @@ pbuf_alloced_custom(pbuf_layer l, u16_t length, pbuf_type type, struct pbuf_cust
} }
if (payload_mem != NULL) { if (payload_mem != NULL) {
pbuf_init_alloced_pbuf(&p->pbuf, (u8_t *)payload_mem + LWIP_MEM_ALIGN_SIZE(offset), payload = (u8_t *)payload_mem + LWIP_MEM_ALIGN_SIZE(offset);
length, length, type, PBUF_FLAG_IS_CUSTOM);
} else { } else {
pbuf_init_alloced_pbuf(&p->pbuf, NULL, length, length, type, PBUF_FLAG_IS_CUSTOM); payload = NULL;
} }
pbuf_init_alloced_pbuf(&p->pbuf, payload, length, length, type, PBUF_FLAG_IS_CUSTOM);
return &p->pbuf; return &p->pbuf;
} }
#endif /* LWIP_SUPPORT_CUSTOM_PBUF */ #endif /* LWIP_SUPPORT_CUSTOM_PBUF */