Eliminate some warnings

This commit is contained in:
Přemysl Eric Janouch 2018-10-15 03:28:09 +02:00
parent 441c89f654
commit 267a9a561b
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 10 additions and 4 deletions

View File

@ -769,7 +769,9 @@ ws_handler_on_ping_timer (EV_P_ ev_timer *watcher, int revents)
static void static void
ws_handler_on_close_timeout (EV_P_ ev_timer *watcher, int revents) ws_handler_on_close_timeout (EV_P_ ev_timer *watcher, int revents)
{ {
(void) revents;
struct ws_handler *self = watcher->data; struct ws_handler *self = watcher->data;
// TODO: anything else to do here? Invalidate our state? // TODO: anything else to do here? Invalidate our state?
if (self->close_cb) if (self->close_cb)
self->close_cb (self->user_data); self->close_cb (self->user_data);
@ -778,6 +780,7 @@ ws_handler_on_close_timeout (EV_P_ ev_timer *watcher, int revents)
static void static void
ws_handler_on_handshake_timeout (EV_P_ ev_timer *watcher, int revents) ws_handler_on_handshake_timeout (EV_P_ ev_timer *watcher, int revents)
{ {
(void) revents;
struct ws_handler *self = watcher->data; struct ws_handler *self = watcher->data;
// TODO // TODO
} }
@ -1034,9 +1037,12 @@ ws_handler_finish_handshake (struct ws_handler *self)
FAIL_HANDSHAKE (HTTP_400_BAD_REQUEST, NULL); FAIL_HANDSHAKE (HTTP_400_BAD_REQUEST, NULL);
// Okay, we're finally past the basic HTTP/1.1 stuff // Okay, we're finally past the basic HTTP/1.1 stuff
const char *key = str_map_find (&self->headers, SEC_WS_KEY); const char *key = str_map_find (&self->headers, SEC_WS_KEY);
const char *version = str_map_find (&self->headers, SEC_WS_VERSION); const char *version = str_map_find (&self->headers, SEC_WS_VERSION);
const char *protocol = str_map_find (&self->headers, SEC_WS_PROTOCOL); /*
const char *protocol = str_map_find (&self->headers, SEC_WS_PROTOCOL);
const char *extensions = str_map_find (&self->headers, SEC_WS_EXTENSIONS);
*/
if (!key) if (!key)
FAIL_HANDSHAKE (HTTP_400_BAD_REQUEST, NULL); FAIL_HANDSHAKE (HTTP_400_BAD_REQUEST, NULL);
@ -1063,7 +1069,7 @@ ws_handler_finish_handshake (struct ws_handler *self)
xstrdup_printf (SEC_WS_ACCEPT ": %s", response_key)); xstrdup_printf (SEC_WS_ACCEPT ": %s", response_key));
free (response_key); free (response_key);
// TODO: check and set Sec-Websocket-{Extensions,Protocol} // TODO: make it possible to choose Sec-Websocket-{Extensions,Protocol}
ws_handler_http_responsev (self, ws_handler_http_responsev (self,
HTTP_101_SWITCHING_PROTOCOLS, fields.vector); HTTP_101_SWITCHING_PROTOCOLS, fields.vector);