From a3fc38037a5938cf71dc62e413744b15c17ed292 Mon Sep 17 00:00:00 2001 From: sg Date: Fri, 10 Feb 2017 21:30:07 +0100 Subject: [PATCH] minor: move assert to a slightly better place --- src/core/tcp_in.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c index 301659c1..21279e32 100644 --- a/src/core/tcp_in.c +++ b/src/core/tcp_in.c @@ -828,16 +828,15 @@ tcp_process(struct tcp_pcb *pcb) pcb->state = ESTABLISHED; LWIP_DEBUGF(TCP_DEBUG, ("TCP connection established %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest)); #if LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG -#if LWIP_CALLBACK_API - LWIP_ASSERT("pcb->listener->accept != NULL", - (pcb->listener == NULL) || (pcb->listener->accept != NULL)); -#endif if (pcb->listener == NULL) { /* listen pcb might be closed by now */ err = ERR_VAL; } else #endif /* LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG */ { +#if LWIP_CALLBACK_API + LWIP_ASSERT("pcb->listener->accept != NULL", pcb->listener->accept != NULL); +#endif tcp_backlog_accepted(pcb); /* Call the accept function. */ TCP_EVENT_ACCEPT(pcb->listener, pcb, pcb->callback_arg, ERR_OK, err);