clean: fixes for appveyor warnings

[platform/upstream/libwebsockets.git] / lib / server-handshake.c

diff --git a/lib/server-handshake.c b/lib/server-handshake.c
index 85803b9..ec9b14e 100644 (file)
--- a/lib/server-handshake.c
+++ b/lib/server-handshake.c
@@ -128,7 +128,7 @@ lws_extension_server_handshake(struct lws *wsi, char **p, int budget)
                         * ask user code if it's OK to apply it on this
                         * particular connection + protocol
                         */
-                       m = wsi->vhost->protocols[0].callback(wsi,
+                       m = (wsi->protocol->callback)(wsi,
                                LWS_CALLBACK_CONFIRM_EXTENSION_OKAY,
                                wsi->user_space, ext_name, 0);
 
@@ -156,7 +156,7 @@ lws_extension_server_handshake(struct lws *wsi, char **p, int budget)
                                          LWS_EXT_CB_CONSTRUCT,
                                          (void *)&wsi->act_ext_user[
                                                            wsi->count_act_ext],
-                                         &opts, 0)) {
+                                         (void *)&opts, 0)) {
                                lwsl_notice("ext %s failed construction\n",
                                            ext_name);
                                ext_count--;
@@ -190,8 +190,7 @@ lws_extension_server_handshake(struct lws *wsi, char **p, int budget)
                                            !strncmp(args, po->name,
                                                            strlen(po->name))) {
                                                oa.option_name = NULL;
-                                               oa.option_index = (po - opts) /
-                                                               sizeof(*po);
+                                               oa.option_index = po - opts;
                                                oa.start = NULL;
                                                lwsl_debug("setting %s\n", po->name);
                                                if (!ext->callback(