mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-08-23 22:56:00 +00:00
Fixed usage of logging levels (bug #27948: Incorrect logging levels used in various places)
This commit is contained in:
parent
88d02a624a
commit
49bdf32765
|
@ -154,7 +154,7 @@ pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type)
|
||||||
struct pbuf *p, *q, *r;
|
struct pbuf *p, *q, *r;
|
||||||
u16_t offset;
|
u16_t offset;
|
||||||
s32_t rem_len; /* remaining length */
|
s32_t rem_len; /* remaining length */
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 3, ("pbuf_alloc(length=%"U16_F")\n", length));
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc(length=%"U16_F")\n", length));
|
||||||
|
|
||||||
/* determine header offset */
|
/* determine header offset */
|
||||||
offset = 0;
|
offset = 0;
|
||||||
|
@ -182,7 +182,7 @@ pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type)
|
||||||
case PBUF_POOL:
|
case PBUF_POOL:
|
||||||
/* allocate head of pbuf chain into p */
|
/* allocate head of pbuf chain into p */
|
||||||
ALLOC_POOL_PBUF(p);
|
ALLOC_POOL_PBUF(p);
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 3, ("pbuf_alloc: allocated pbuf %p\n", (void *)p));
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc: allocated pbuf %p\n", (void *)p));
|
||||||
if (p == NULL) {
|
if (p == NULL) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -268,7 +268,8 @@ pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type)
|
||||||
/* only allocate memory for the pbuf structure */
|
/* only allocate memory for the pbuf structure */
|
||||||
p = memp_malloc(MEMP_PBUF);
|
p = memp_malloc(MEMP_PBUF);
|
||||||
if (p == NULL) {
|
if (p == NULL) {
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 2, ("pbuf_alloc: Could not allocate MEMP_PBUF for PBUF_%s.\n",
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
|
||||||
|
("pbuf_alloc: Could not allocate MEMP_PBUF for PBUF_%s.\n",
|
||||||
(type == PBUF_ROM) ? "ROM" : "REF"));
|
(type == PBUF_ROM) ? "ROM" : "REF"));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -286,7 +287,7 @@ pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type)
|
||||||
p->ref = 1;
|
p->ref = 1;
|
||||||
/* set flags */
|
/* set flags */
|
||||||
p->flags = 0;
|
p->flags = 0;
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 3, ("pbuf_alloc(length=%"U16_F") == %p\n", length, (void *)p));
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc(length=%"U16_F") == %p\n", length, (void *)p));
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -426,9 +427,9 @@ pbuf_header(struct pbuf *p, s16_t header_size_increment)
|
||||||
p->payload = (u8_t *)p->payload - header_size_increment;
|
p->payload = (u8_t *)p->payload - header_size_increment;
|
||||||
/* boundary check fails? */
|
/* boundary check fails? */
|
||||||
if ((u8_t *)p->payload < (u8_t *)p + SIZEOF_STRUCT_PBUF) {
|
if ((u8_t *)p->payload < (u8_t *)p + SIZEOF_STRUCT_PBUF) {
|
||||||
LWIP_DEBUGF( PBUF_DEBUG | 2, ("pbuf_header: failed as %p < %p (not enough space for new header size)\n",
|
LWIP_DEBUGF( PBUF_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
|
||||||
(void *)p->payload,
|
("pbuf_header: failed as %p < %p (not enough space for new header size)\n",
|
||||||
(void *)(p + 1)));\
|
(void *)p->payload, (void *)(p + 1)));
|
||||||
/* restore old payload pointer */
|
/* restore old payload pointer */
|
||||||
p->payload = payload;
|
p->payload = payload;
|
||||||
/* bail out unsuccesfully */
|
/* bail out unsuccesfully */
|
||||||
|
@ -455,7 +456,7 @@ pbuf_header(struct pbuf *p, s16_t header_size_increment)
|
||||||
p->len += header_size_increment;
|
p->len += header_size_increment;
|
||||||
p->tot_len += header_size_increment;
|
p->tot_len += header_size_increment;
|
||||||
|
|
||||||
LWIP_DEBUGF(PBUF_DEBUG, ("pbuf_header: old %p new %p (%"S16_F")\n",
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_header: old %p new %p (%"S16_F")\n",
|
||||||
(void *)payload, (void *)p->payload, header_size_increment));
|
(void *)payload, (void *)p->payload, header_size_increment));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -504,10 +505,11 @@ pbuf_free(struct pbuf *p)
|
||||||
if (p == NULL) {
|
if (p == NULL) {
|
||||||
LWIP_ASSERT("p != NULL", p != NULL);
|
LWIP_ASSERT("p != NULL", p != NULL);
|
||||||
/* if assertions are disabled, proceed with debug output */
|
/* if assertions are disabled, proceed with debug output */
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 2, ("pbuf_free(p == NULL) was called.\n"));
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
|
||||||
|
("pbuf_free(p == NULL) was called.\n"));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 3, ("pbuf_free(%p)\n", (void *)p));
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free(%p)\n", (void *)p));
|
||||||
|
|
||||||
PERF_START;
|
PERF_START;
|
||||||
|
|
||||||
|
@ -534,7 +536,7 @@ pbuf_free(struct pbuf *p)
|
||||||
if (ref == 0) {
|
if (ref == 0) {
|
||||||
/* remember next pbuf in chain for next iteration */
|
/* remember next pbuf in chain for next iteration */
|
||||||
q = p->next;
|
q = p->next;
|
||||||
LWIP_DEBUGF( PBUF_DEBUG | 2, ("pbuf_free: deallocating %p\n", (void *)p));
|
LWIP_DEBUGF( PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free: deallocating %p\n", (void *)p));
|
||||||
type = p->type;
|
type = p->type;
|
||||||
/* is this a pbuf from the pool? */
|
/* is this a pbuf from the pool? */
|
||||||
if (type == PBUF_POOL) {
|
if (type == PBUF_POOL) {
|
||||||
|
@ -552,7 +554,7 @@ pbuf_free(struct pbuf *p)
|
||||||
/* p->ref > 0, this pbuf is still referenced to */
|
/* p->ref > 0, this pbuf is still referenced to */
|
||||||
/* (and so the remaining pbufs in chain as well) */
|
/* (and so the remaining pbufs in chain as well) */
|
||||||
} else {
|
} else {
|
||||||
LWIP_DEBUGF( PBUF_DEBUG | 2, ("pbuf_free: %p has ref %"U16_F", ending here.\n", (void *)p, ref));
|
LWIP_DEBUGF( PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free: %p has ref %"U16_F", ending here.\n", (void *)p, ref));
|
||||||
/* stop walking through the chain */
|
/* stop walking through the chain */
|
||||||
p = NULL;
|
p = NULL;
|
||||||
}
|
}
|
||||||
|
@ -657,7 +659,7 @@ pbuf_chain(struct pbuf *h, struct pbuf *t)
|
||||||
pbuf_cat(h, t);
|
pbuf_cat(h, t);
|
||||||
/* t is now referenced by h */
|
/* t is now referenced by h */
|
||||||
pbuf_ref(t);
|
pbuf_ref(t);
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_FRESH | 2, ("pbuf_chain: %p references %p\n", (void *)h, (void *)t));
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_chain: %p references %p\n", (void *)h, (void *)t));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -686,10 +688,10 @@ pbuf_dechain(struct pbuf *p)
|
||||||
/* total length of pbuf p is its own length only */
|
/* total length of pbuf p is its own length only */
|
||||||
p->tot_len = p->len;
|
p->tot_len = p->len;
|
||||||
/* q is no longer referenced by p, free it */
|
/* q is no longer referenced by p, free it */
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_STATE, ("pbuf_dechain: unreferencing %p\n", (void *)q));
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_dechain: unreferencing %p\n", (void *)q));
|
||||||
tail_gone = pbuf_free(q);
|
tail_gone = pbuf_free(q);
|
||||||
if (tail_gone > 0) {
|
if (tail_gone > 0) {
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_STATE,
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE,
|
||||||
("pbuf_dechain: deallocated %p (as it is no longer referenced)\n", (void *)q));
|
("pbuf_dechain: deallocated %p (as it is no longer referenced)\n", (void *)q));
|
||||||
}
|
}
|
||||||
/* return remaining tail or NULL if deallocated */
|
/* return remaining tail or NULL if deallocated */
|
||||||
|
@ -722,7 +724,7 @@ pbuf_copy(struct pbuf *p_to, struct pbuf *p_from)
|
||||||
{
|
{
|
||||||
u16_t offset_to=0, offset_from=0, len;
|
u16_t offset_to=0, offset_from=0, len;
|
||||||
|
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 3, ("pbuf_copy(%p, %p)\n",
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_copy(%p, %p)\n",
|
||||||
(void*)p_to, (void*)p_from));
|
(void*)p_to, (void*)p_from));
|
||||||
|
|
||||||
/* is the target big enough to hold the source? */
|
/* is the target big enough to hold the source? */
|
||||||
|
@ -768,7 +770,7 @@ pbuf_copy(struct pbuf *p_to, struct pbuf *p_from)
|
||||||
(p_to->next == NULL), return ERR_VAL;);
|
(p_to->next == NULL), return ERR_VAL;);
|
||||||
}
|
}
|
||||||
} while (p_from);
|
} while (p_from);
|
||||||
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 1, ("pbuf_copy: end of chain reached.\n"));
|
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_copy: end of chain reached.\n"));
|
||||||
return ERR_OK;
|
return ERR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user