From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 22 Aug 2025 14:15:11 +0000 (+0200)
Subject: tool_operate: use stricter curl_multi_setopt() arguments
X-Git-Tag: curl-8_16_0~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfbee798ca1f58c6471f0cb91825c75a36de2863;p=thirdparty%2Fcurl.git

tool_operate: use stricter curl_multi_setopt() arguments

To please the curl_multi_setopt() typechecker

- set multi callback protypes to match exactylu
- set CURLMOPT_MAX_HOST_CONNECTIONS as a long

Closes #18357
---

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 90e1fbf860..22bb3ca736 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -1514,9 +1514,9 @@ static void on_uv_timeout(uv_timer_t *req)
 }
 
 /* callback from libcurl to update the timeout expiry */
-static int cb_timeout(CURLM *multi, long timeout_ms,
-                      struct datauv *uv)
+static int cb_timeout(CURLM *multi, long timeout_ms, void *userp)
 {
+  struct datauv *uv = userp;
   (void)multi;
 #if DEBUG_UV
   fprintf(tool_stderr, "parallel_event: cb_timeout=%ld\n", timeout_ms);
@@ -1562,11 +1562,11 @@ static void destroy_context(struct contextuv *c)
 
 /* callback from libcurl to update socket activity to wait for */
 static int cb_socket(CURL *easy, curl_socket_t s, int action,
-                     struct datauv *uv,
-                     void *socketp)
+                     void *userp, void *socketp)
 {
   struct contextuv *c;
   int events = 0;
+  struct datauv *uv = userp;
   (void)easy;
 
 #if DEBUG_UV
@@ -1622,7 +1622,7 @@ static CURLcode parallel_event(struct parastate *s)
   curl_multi_setopt(s->multi, CURLMOPT_SOCKETDATA, &uv);
   curl_multi_setopt(s->multi, CURLMOPT_TIMERFUNCTION, cb_timeout);
   curl_multi_setopt(s->multi, CURLMOPT_TIMERDATA, &uv);
-  curl_multi_setopt(s->multi, CURLMOPT_MAX_HOST_CONNECTIONS,
+  curl_multi_setopt(s->multi, CURLMOPT_MAX_HOST_CONNECTIONS, (long)
                     global->parallel_host);
 
   /* kickstart the thing */