Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

sul: remove NULL service calls from all plats

Browse source
This commit is contained in:
Andy Green 2019-08-30 06:10:15 +01:00
parent 5f238ed86d
commit a20fa90cfe
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/plat/freertos/freertos-service.c
View file

@ -29,7 +29,6 @@ lws_plat_service(struct lws_context *context, int timeout_ms)
{
int n = _lws_plat_service_tsi(context, timeout_ms, 0);
lws_service_fd_tsi(context, NULL, 0);
#if !defined(LWS_AMAZON_RTOS)
esp_task_wdt_reset();
#endif
@ -177,11 +176,8 @@ _lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi)
pt->context->tls_ops->fake_POLLIN_for_buffered)
m |= pt->context->tls_ops->fake_POLLIN_for_buffered(pt);
if (!m && !n) {
lws_service_fd_tsi(context, NULL, tsi);
if (!m && !n)
return 0;
}
faked_service:
m = lws_service_flag_pending(context, tsi);

4
lib/plat/optee/network.c
View file

@ -141,10 +141,8 @@ _lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi)
pt->context->tls_ops->fake_POLLIN_for_buffered)
m = pt->context->tls_ops->fake_POLLIN_for_buffered(pt);
if (/*!pt->ws.rx_draining_ext_list && */!m && !n) { /* nothing to do */
lws_service_fd_tsi(context, NULL, tsi);
if (/*!pt->ws.rx_draining_ext_list && */!m && !n) /* nothing to do */
return 0;
}
faked_service:
m = lws_service_flag_pending(context, tsi);

9
lib/plat/windows/windows-service.c
View file

@ -204,10 +204,13 @@ _lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi)
lws_service_fd_tsi(context, pfd, tsi);
}
}
} else if (ev == WSA_WAIT_TIMEOUT) {
lws_service_fd(context, NULL);
} else if (ev == WSA_WAIT_FAILED)
return 0;
}
// if (ev == WSA_WAIT_TIMEOUT) { }
// if (ev == WSA_WAIT_FAILED)
// return 0;
return 0;
}