summaryrefslogtreecommitdiff
path: root/src/curl
diff options
context:
space:
mode:
Diffstat (limited to 'src/curl')
-rw-r--r--src/curl/curl.c6
-rw-r--r--src/curl/http.c6
-rw-r--r--src/curl/websocket.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/curl/curl.c b/src/curl/curl.c
index 5a5ac01..d18035c 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -15,7 +15,7 @@ static void curl_socket_action_callback(struct ev_loop *loop, ev_io *w, s32 reve
s32 running;
CURLMcode mc = curl_multi_socket_action(curl->multi_handle, curl->sock, action, &running);
if (mc != CURLM_OK) {
- error("curl_multi_socket_action() failed (%s).", curl_multi_strerror(mc));
+ log_error("curl_multi_socket_action() failed (%s).", curl_multi_strerror(mc));
return;
}
curl->handle_events(curl->userdata, curl);
@@ -118,7 +118,7 @@ bool nn_curl_add_handle(struct nn_curl *curl)
// a callback is running on another thread.
CURLMcode mc = curl_multi_add_handle(curl->multi_handle, curl->handle);
if (mc != CURLM_OK) {
- error("curl_multi_add_handle() failed (%s).", curl_multi_strerror(mc));
+ log_error("curl_multi_add_handle() failed (%s).", curl_multi_strerror(mc));
return false;
}
curl->added = true;
@@ -130,7 +130,7 @@ bool nn_curl_remove_handle(struct nn_curl *curl)
al_assert(curl->added);
CURLMcode mc = curl_multi_remove_handle(curl->multi_handle, curl->handle);
if (mc != CURLM_OK) {
- error("curl_multi_remove_handle() failed (%s).", curl_multi_strerror(mc));
+ log_error("curl_multi_remove_handle() failed (%s).", curl_multi_strerror(mc));
return false;
}
curl->added = false;
diff --git a/src/curl/http.c b/src/curl/http.c
index 993aef7..154e0c7 100644
--- a/src/curl/http.c
+++ b/src/curl/http.c
@@ -32,7 +32,7 @@ static void http_handle_events(void *userdata, struct nn_curl *curl)
al_assert(msg->easy_handle == curl->handle);
CURLcode code = msg->data.result;
if (code != CURLE_OK) {
- error("Curl error: %s.", curl_easy_strerror(code));
+ log_error("Curl error: %s.", curl_easy_strerror(code));
http->status_code = -1;
http->callback(http->userdata, NNWT_HTTP_ERROR, NULL, &http->status_code);
return;
@@ -59,10 +59,10 @@ static void http_handle_events(void *userdata, struct nn_curl *curl)
return;
}
case CURLMSG_LAST:
- debug("Unhandled CURLMSG_LAST.");
+ log_debug("Unhandled CURLMSG_LAST.");
break;
case CURLMSG_NONE:
- debug("Unhandled CURLMSG_NONE.");
+ log_debug("Unhandled CURLMSG_NONE.");
break;
}
}
diff --git a/src/curl/websocket.c b/src/curl/websocket.c
index 8995221..d40dd0e 100644
--- a/src/curl/websocket.c
+++ b/src/curl/websocket.c
@@ -33,7 +33,7 @@ static size_t stream_write_callback(char *buffer, size_t size, size_t nmemb, voi
struct nn_websocket *ws = (struct nn_websocket *)userdata;
const struct curl_ws_frame *m = curl_ws_meta(ws->curl.handle);
size_t frame_size = m->offset + m->len + m->bytesleft;
- debug("frame_size: %zu, bytesleft: %zu.", frame_size, m->bytesleft);
+ log_debug("frame_size: %zu, bytesleft: %zu.", frame_size, m->bytesleft);
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) {
@@ -82,7 +82,7 @@ bool nn_websocket_send_frame(struct nn_websocket *ws, u8 *data, size_t size)
size_t sent;
CURLcode code = curl_ws_send(ws->curl.handle, data, size, &sent, 0, CURLWS_TEXT);
if (code != CURLE_OK) {
- error("curl_ws_send() failed (%s).", curl_easy_strerror(code));
+ log_error("curl_ws_send() failed (%s).", curl_easy_strerror(code));
return false;
}
al_assert(sent == size);