mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-05 22:29:49 +00:00
Fixed logging of timeout-function-pointer (pointer to local stack was logged instead of actual function pointer), minor coding style fix
This commit is contained in:
parent
f4c0655190
commit
0c136893e5
@ -97,7 +97,7 @@ sys_mbox_fetch(sys_mbox_t mbox, void **msg)
|
|||||||
arg = tmptimeout->arg;
|
arg = tmptimeout->arg;
|
||||||
memp_free(MEMP_SYS_TIMEOUT, tmptimeout);
|
memp_free(MEMP_SYS_TIMEOUT, tmptimeout);
|
||||||
if (h != NULL) {
|
if (h != NULL) {
|
||||||
LWIP_DEBUGF(SYS_DEBUG, ("smf calling h=%p(%p)\n", (void*)&h, arg));
|
LWIP_DEBUGF(SYS_DEBUG, ("smf calling h=%p(%p)\n", *(void**)&h, arg));
|
||||||
h(arg);
|
h(arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -154,7 +154,7 @@ sys_sem_wait(sys_sem_t sem)
|
|||||||
arg = tmptimeout->arg;
|
arg = tmptimeout->arg;
|
||||||
memp_free(MEMP_SYS_TIMEOUT, tmptimeout);
|
memp_free(MEMP_SYS_TIMEOUT, tmptimeout);
|
||||||
if (h != NULL) {
|
if (h != NULL) {
|
||||||
LWIP_DEBUGF(SYS_DEBUG, ("ssw h=%p(%p)\n", (void*)&h, (void *)arg));
|
LWIP_DEBUGF(SYS_DEBUG, ("ssw h=%p(%p)\n", *(void**)&h, (void *)arg));
|
||||||
h(arg);
|
h(arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -203,7 +203,7 @@ sys_timeout(u32_t msecs, sys_timeout_handler h, void *arg)
|
|||||||
timeouts = sys_arch_timeouts();
|
timeouts = sys_arch_timeouts();
|
||||||
|
|
||||||
LWIP_DEBUGF(SYS_DEBUG, ("sys_timeout: %p msecs=%"U32_F" h=%p arg=%p\n",
|
LWIP_DEBUGF(SYS_DEBUG, ("sys_timeout: %p msecs=%"U32_F" h=%p arg=%p\n",
|
||||||
(void *)timeout, msecs, (void*)&h, (void *)arg));
|
(void *)timeout, msecs, *(void**)&h, (void *)arg));
|
||||||
|
|
||||||
if (timeouts == NULL) {
|
if (timeouts == NULL) {
|
||||||
LWIP_ASSERT("sys_timeout: timeouts != NULL", timeouts != NULL);
|
LWIP_ASSERT("sys_timeout: timeouts != NULL", timeouts != NULL);
|
||||||
@ -264,13 +264,15 @@ sys_untimeout(sys_timeout_handler h, void *arg)
|
|||||||
if ((t->h == h) && (t->arg == arg)) {
|
if ((t->h == h) && (t->arg == arg)) {
|
||||||
/* We have a match */
|
/* We have a match */
|
||||||
/* Unlink from previous in list */
|
/* Unlink from previous in list */
|
||||||
if (prev_t == NULL)
|
if (prev_t == NULL) {
|
||||||
timeouts->next = t->next;
|
timeouts->next = t->next;
|
||||||
else
|
} else {
|
||||||
prev_t->next = t->next;
|
prev_t->next = t->next;
|
||||||
|
}
|
||||||
/* If not the last one, add time of this one back to next */
|
/* If not the last one, add time of this one back to next */
|
||||||
if (t->next != NULL)
|
if (t->next != NULL) {
|
||||||
t->next->time += t->time;
|
t->next->time += t->time;
|
||||||
|
}
|
||||||
memp_free(MEMP_SYS_TIMEOUT, t);
|
memp_free(MEMP_SYS_TIMEOUT, t);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user