FS-6103 --resolve

This commit is contained in:
Jeff Lenk 2014-01-17 16:27:00 -06:00
parent 756ba1c8a8
commit a4dfb5463f
2 changed files with 17 additions and 20 deletions

View File

@ -594,7 +594,7 @@ abyss_bool websocket_hook(TSession *r)
wsh = ws_init(r);
if (!wsh) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "websocket error %d\n", ret);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "websocket memory error\n");
return FALSE;
}

View File

@ -311,7 +311,6 @@ issize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes)
}
return r;
}
issize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
@ -331,13 +330,11 @@ issize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
} else {
return 0;
}
return r;
}
wsh_t * ws_init(ws_tsession_t *tsession)
{
wsh_t *wsh = malloc(sizeof(*wsh));
wsh_t *wsh = (wsh_t *)malloc(sizeof(*wsh));
if (!wsh) return NULL;