diff --git a/lib/context.c b/lib/context.c index faa339bb..9caa3204 100644 --- a/lib/context.c +++ b/lib/context.c @@ -157,10 +157,7 @@ lws_create_context(struct lws_context_creation_info *info) goto bail; } - if (lws_plat_init_lookup(context)) - goto bail; - - if (lws_plat_init_fd_tables(context)) + if (lws_plat_init(context, info)) goto bail; lws_context_init_extensions(info, context); diff --git a/lib/lws-plat-mbed3.c b/lib/lws-plat-mbed3.c index 06d3ca8f..372cbbb6 100644 --- a/lib/lws-plat-mbed3.c +++ b/lib/lws-plat-mbed3.c @@ -106,16 +106,9 @@ lws_plat_drop_app_privileges(struct lws_context_creation_info *info) } LWS_VISIBLE int -lws_plat_init_lookup(struct lws_context *context) +lws_plat_init(struct lws_context *context, + struct lws_context_creation_info *info) { - (void)context; - return 0; -} - -LWS_VISIBLE int -lws_plat_init_fd_tables(struct lws_context *context) -{ - (void)context; return 0; } diff --git a/lib/lws-plat-unix.c b/lib/lws-plat-unix.c index a087439c..7673765c 100644 --- a/lib/lws-plat-unix.c +++ b/lib/lws-plat-unix.c @@ -272,7 +272,8 @@ lws_plat_drop_app_privileges(struct lws_context_creation_info *info) } LWS_VISIBLE int -lws_plat_init_lookup(struct lws_context *context) +lws_plat_init(struct lws_context *context, + struct lws_context_creation_info *info) { context->lws_lookup = lws_zalloc(sizeof(struct lws *) * context->max_fds); if (context->lws_lookup == NULL) { @@ -282,12 +283,6 @@ lws_plat_init_lookup(struct lws_context *context) return 1; } - return 0; -} - -LWS_VISIBLE int -lws_plat_init_fd_tables(struct lws_context *context) -{ context->fd_random = open(SYSTEM_RANDOM_FILEPATH, O_RDONLY); if (context->fd_random < 0) { lwsl_err("Unable to open random device %s %d\n", diff --git a/lib/lws-plat-win.c b/lib/lws-plat-win.c index d1a36949..43b7c6a4 100644 --- a/lib/lws-plat-win.c +++ b/lib/lws-plat-win.c @@ -257,7 +257,8 @@ lws_plat_drop_app_privileges(struct lws_context_creation_info *info) } LWS_VISIBLE int -lws_plat_init_lookup(struct lws_context *context) +lws_plat_init(struct lws_context *context, + struct lws_context_creation_info *info) { int i; @@ -269,12 +270,6 @@ lws_plat_init_lookup(struct lws_context *context) } } - return 0; -} - -LWS_VISIBLE int -lws_plat_init_fd_tables(struct lws_context *context) -{ context->events = lws_malloc(sizeof(WSAEVENT) * (context->max_fds + 1)); if (context->events == NULL) { lwsl_err("Unable to allocate events array for %d connections\n", diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h index 821ab4a3..99e34ba3 100644 --- a/lib/private-libwebsockets.h +++ b/lib/private-libwebsockets.h @@ -1291,9 +1291,8 @@ lws_poll_listen_fd(struct lws_pollfd *fd); LWS_EXTERN int lws_plat_service(struct lws_context *context, int timeout_ms); LWS_EXTERN int -lws_plat_init_lookup(struct lws_context *context); -LWS_EXTERN int -lws_plat_init_fd_tables(struct lws_context *context); +lws_plat_init(struct lws_context *context, + struct lws_context_creation_info *info); LWS_EXTERN void lws_plat_drop_app_privileges(struct lws_context_creation_info *info); LWS_EXTERN unsigned long long