diff options
Diffstat (limited to 'src/curl')
| -rw-r--r-- | src/curl/curl.c | 10 | ||||
| -rw-r--r-- | src/curl/http.c | 21 | ||||
| -rw-r--r-- | src/curl/websocket.c | 3 |
3 files changed, 23 insertions, 11 deletions
diff --git a/src/curl/curl.c b/src/curl/curl.c index c996011..d317224 100644 --- a/src/curl/curl.c +++ b/src/curl/curl.c @@ -21,7 +21,9 @@ static void curl_socket_action_callback(struct ev_loop *loop, ev_io *w, s32 reve static void set_sock(struct nn_curl *curl, s32 what) { - if (curl->event.active) ev_io_stop(curl->loop->ev, &curl->event); + if (curl->event.active) { + ev_io_stop(curl->loop->ev, &curl->event); + } s32 action = (what & CURL_POLL_IN ? EV_READ : 0) | (what & CURL_POLL_OUT ? EV_WRITE : 0); ev_io_init(&curl->event, curl_socket_action_callback, curl->sock, action); ev_io_start(curl->loop->ev, &curl->event); @@ -71,8 +73,9 @@ static s32 timer_callback(CURLM *multi, s64 timeout_ms, void *userp) curl->timer_started = false; } - if (timeout_ms == -1) + if (timeout_ms == -1) { return 0; + } curl->timer.data = curl; ev_timer_init(&curl->timer, timeout_callback, timeout_ms / 1000.0, 0.0); @@ -145,8 +148,9 @@ bool nn_curl_remove_handle(struct nn_curl *curl) void nn_curl_close(struct nn_curl *curl) { - if (curl->handle && curl->multi_handle && curl->added) + if (curl->handle && curl->multi_handle && curl->added) { nn_curl_remove_handle(curl); + } if (curl->handle) curl_easy_cleanup(curl->handle); if (curl->multi_handle) curl_multi_cleanup(curl->multi_handle); } diff --git a/src/curl/http.c b/src/curl/http.c index 00d5cd9..60d26f1 100644 --- a/src/curl/http.c +++ b/src/curl/http.c @@ -8,14 +8,16 @@ static void check_status_codes(struct nn_curl *curl) if (http->status_code <= 0) { curl_easy_getinfo(curl->handle, CURLINFO_RESPONSE_CODE, &http->status_code); - if (http->status_code > 0) + if (http->status_code > 0) { http->callback(http->userdata, NNWT_HTTP_RESPONSE_CODE, NULL, http->status_code); + } } if (http->content_length < 0 && http->status_code == 200) { curl_easy_getinfo(curl->handle, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &http->content_length); - if (http->content_length >= 0) + if (http->content_length >= 0) { http->callback(http->userdata, NNWT_HTTP_CONTENT_LENGTH, NULL, (s64)http->content_length); + } } } @@ -37,8 +39,9 @@ static void http_handle_events(void *userdata, struct nn_curl *curl) return; } - if (!nn_curl_remove_handle(curl)) + if (!nn_curl_remove_handle(curl)) { return; + } check_status_codes(curl); @@ -57,8 +60,9 @@ static void http_handle_events(void *userdata, struct nn_curl *curl) http->status_code = -1; http->content_length = -1; - if (!nn_curl_add_handle(curl)) + if (!nn_curl_add_handle(curl)) { return; + } } else { http->callback(http->userdata, NNWT_HTTP_ERROR, NULL, http->status_code); } @@ -137,8 +141,9 @@ static size_t request_callback(void *userdata, u8 op, u8 *buf, s64 int0) al_assert(request->pointer >= 0); size_t size = nn_buffer_get_size(&request->payload); - if (request->pointer + int0 > (off_t)size) + if (request->pointer + int0 > (off_t)size) { int0 = size - request->pointer; + } nn_buffer_read(&request->payload, buf, request->pointer, int0); request->pointer += int0; @@ -186,8 +191,9 @@ static bool init_request_internal(struct nn_http *http, u8 method) curl_easy_setopt(curl->handle, CURLOPT_READFUNCTION, stream_read_callback); curl_easy_setopt(curl->handle, CURLOPT_READDATA, http); - if (http->headers) + if (http->headers) { curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, http->headers); + } curl->handle_events = http_handle_events; @@ -225,8 +231,9 @@ bool nn_http_request(struct nn_http_request *request, u8 method, struct nn_event request->http.userdata = request; size_t payload = nn_buffer_get_size(&request->payload); - if (payload > 0) + if (payload > 0) { curl_easy_setopt(curl->handle, CURLOPT_POSTFIELDSIZE, (s64)payload); + } request->callback = callback; request->userdata = userdata; diff --git a/src/curl/websocket.c b/src/curl/websocket.c index 25c9996..0bfcb9e 100644 --- a/src/curl/websocket.c +++ b/src/curl/websocket.c @@ -38,8 +38,9 @@ static size_t stream_write_callback(char *buffer, size_t size, size_t nmemb, voi nn_buffer_ensure_space(&ws->frame, frame_size); al_memcpy(nn_buffer_get_ptr(&ws->frame, m->offset), buffer, m->len); - if (m->bytesleft == 0) + if (m->bytesleft == 0) { ws->callback(ws->userdata, m, nn_buffer_get_ptr(&ws->frame, 0), frame_size); + } return m->len; } |