diff --git a/examples/hammer_test.c b/examples/hammer_test.c index 6e51bbd..7fc3dab 100644 --- a/examples/hammer_test.c +++ b/examples/hammer_test.c @@ -29,7 +29,7 @@ void perform_random_operation(struct us_socket *s) { } break; case 3: { - us_socket_write(s, long_buffer, long_length, 0); + us_socket_write(s, (char *) long_buffer, long_length, 0); } break; } diff --git a/examples/http_server.c b/examples/http_server.c index 149ea5a..2999db0 100644 --- a/examples/http_server.c +++ b/examples/http_server.c @@ -90,7 +90,7 @@ int main() { struct http_context *http_context_ext = (struct http_context *) us_socket_context_ext(http_context); http_context_ext->response = (char *) malloc(128 + sizeof(body) - 1); - http_context_ext->length = snprintf(http_context_ext->response, 128 + sizeof(body) - 1, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\n\r\n%s", sizeof(body) - 1, body); + http_context_ext->length = snprintf(http_context_ext->response, 128 + sizeof(body) - 1, "HTTP/1.1 200 OK\r\nContent-Length: %ld\r\n\r\n%s", sizeof(body) - 1, body); /* Set up event handlers */ us_socket_context_on_open(http_context, on_http_socket_open); diff --git a/src/eventing/epoll.c b/src/eventing/epoll.c index 94456a7..22f91a1 100644 --- a/src/eventing/epoll.c +++ b/src/eventing/epoll.c @@ -103,7 +103,7 @@ void us_poll_stop(struct us_poll *p, struct us_loop *loop) { unsigned int us_internal_accept_poll_event(struct us_poll *p) { int fd = us_poll_fd(p); uint64_t buf; - read(fd, &buf, 8); + int read_length = read(fd, &buf, 8); return buf; } @@ -126,7 +126,7 @@ void us_timer_close(struct us_timer *timer) { close(us_poll_fd(&cb->p)); /* (regular) sockets are the only polls which are not freed immediately */ - us_poll_free(timer, cb->loop); + us_poll_free((struct us_poll *) timer, cb->loop); } void us_timer_set(struct us_timer *t, void (*cb)(struct us_timer *t), int ms, int repeat_ms) { @@ -169,7 +169,7 @@ void us_internal_async_close(struct us_internal_async *a) { close(us_poll_fd(&cb->p)); /* (regular) sockets are the only polls which are not freed immediately */ - us_poll_free(a, cb->loop); + us_poll_free((struct us_poll *) a, cb->loop); } void us_internal_async_set(struct us_internal_async *a, void (*cb)(struct us_internal_async *)) { @@ -182,7 +182,7 @@ void us_internal_async_set(struct us_internal_async *a, void (*cb)(struct us_int void us_internal_async_wakeup(struct us_internal_async *a) { uint64_t one = 1; - write(us_poll_fd((struct us_poll *) a), &one, 8); + int written = write(us_poll_fd((struct us_poll *) a), &one, 8); } #endif diff --git a/src/eventing/libuv.c b/src/eventing/libuv.c index bbbe208..b333a39 100644 --- a/src/eventing/libuv.c +++ b/src/eventing/libuv.c @@ -43,7 +43,7 @@ void us_poll_init(struct us_poll *p, LIBUS_SOCKET_DESCRIPTOR fd, int poll_type) } void us_poll_free(struct us_poll *p, struct us_loop *loop) { - if (uv_is_closing(&p->uv_p)) { + if (uv_is_closing((uv_handle_t *) &p->uv_p)) { p->uv_p.data = p; } else { free(p); @@ -105,12 +105,12 @@ struct us_loop *us_create_loop(int default_hint, void (*wakeup_cb)(struct us_loo loop->uv_pre = malloc(sizeof(uv_prepare_t)); uv_prepare_init(loop->uv_loop, loop->uv_pre); uv_prepare_start(loop->uv_pre, prepare_cb); - uv_unref(loop->uv_pre); + uv_unref((uv_handle_t *) loop->uv_pre); loop->uv_pre->data = loop; loop->uv_check = malloc(sizeof(uv_check_t)); uv_check_init(loop->uv_loop, loop->uv_check); - uv_unref(loop->uv_check); + uv_unref((uv_handle_t *) loop->uv_check); uv_check_start(loop->uv_check, check_cb); loop->uv_check->data = loop; @@ -221,7 +221,7 @@ void us_internal_async_set(struct us_internal_async *a, void (*cb)(struct us_int uv_async_t *uv_async = (uv_async_t *) (internal_cb + 1); uv_async_init(internal_cb->loop->uv_loop, uv_async, async_cb); - uv_unref(uv_async); + uv_unref((uv_handle_t *) uv_async); uv_async->data = internal_cb; } diff --git a/src/ssl.c b/src/ssl.c index 1d48476..b31b230 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -199,7 +199,6 @@ void ssl_on_data(struct us_ssl_socket *s, void *data, int length) { // check this then? if (SSL_get_shutdown(s->ssl) & SSL_RECEIVED_SHUTDOWN) { - received_shutdown: printf("SSL_RECEIVED_SHUTDOWN\n"); //us_