Simplify packet_pool, various fixes

Signed-off-by: Andrew Opalach <andrew@akon.city>

3 files changed, 6 insertions, 9 deletions

diff --git a/src/curl/http.c b/src/curl/http.c
index cdd740b..b3c13a2 100644
--- a/src/curl/http.c
+++ b/src/curl/http.c
@@ -92,12 +92,12 @@ void aki_http_add_header(struct aki_http *http, str *header)
     al_free(c_str);
 }
 
-void aki_http_set_range(struct aki_http *http, ssize_t start, ssize_t end)
+void aki_http_set_range(struct aki_http *http, size_t start, size_t end)
 {
-    char range[64];
-    if (start < 0) al_sprintf(range, "-%zd", end);
-    else if (end < 0) al_sprintf(range, "%zd-", start);
-    else al_sprintf(range, "%zd-%zd", start, end);
+    char range[44];
+    if (start == 0u) al_snprintf(range, sizeof(range), "-%zu", end);
+    else if (end == 0u) al_snprintf(range, sizeof(range), "%zu-", start);
+    else al_snprintf(range, sizeof(range), "%zu-%zu", start, end);
     curl_easy_setopt(http->curl.handle, CURLOPT_RANGE, range);
 }
 
diff --git a/src/curl/http.h b/src/curl/http.h
index 28942b9..3d0b796 100644
--- a/src/curl/http.h
+++ b/src/curl/http.h
@@ -46,7 +46,7 @@ bool aki_http_init(struct aki_http *http);
 void aki_http_set_url(struct aki_http *http, str *url);
 void aki_http_set_user_agent(struct aki_http *http, str *user_agent);
 void aki_http_add_header(struct aki_http *http, str *header);
-void aki_http_set_range(struct aki_http *http, ssize_t start, ssize_t end);
+void aki_http_set_range(struct aki_http *http, size_t start, size_t end);
 void aki_http_close(struct aki_http *http);
 bool aki_http_request_stream(struct aki_http *http, u8 method, struct aki_event_loop *loop,
     size_t (*callback)(void *, u8, u8 *, s64), void *userdata);
diff --git a/src/curl/websocket.c b/src/curl/websocket.c
index aede3de..8016981 100644
--- a/src/curl/websocket.c
+++ b/src/curl/websocket.c
@@ -54,9 +54,6 @@ void aki_websocket_set_url(struct aki_websocket *ws, str *url)
 bool aki_websocket_connect(struct aki_websocket *ws, struct aki_event_loop *loop,
     void (*callback)(void *, const struct curl_ws_frame *, u8 *, size_t), void *userdata)
 {
-    // Connect blocking.
-    //curl_easy_setopt(ws->curl.handle, CURLOPT_CONNECT_ONLY, 2L);
-    //curl_easy_perform(ws->curl.handle);
     curl_easy_setopt(ws->curl.handle, CURLOPT_CONNECT_ONLY, 0L);
     ws->curl.loop = loop;
     ws->callback = callback;