multi: fix to build on IBMi

Sync function declaration with definition. Update related local vars.

Follow-up to 4701a6d2ae9f0b66a0feac4061868e944353449b #19695
Fixes #20190
Closes #20191

diff --git a/lib/multi.c b/lib/multi.c
index b65be603614d7cbd6a9cfc5f67f842aea8952b25..7cfd053c903c2c43c7f2879224878e0884afc058 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1220,7 +1220,8 @@ CURLMcode curl_multi_fdset(CURLM *m,
   int this_max_fd = -1;
   struct Curl_multi *multi = m;
   struct easy_pollset ps;
-  unsigned int i, mid;
+  unsigned int i;
+  uint32_t mid;
   (void)exc_fd_set;
 
   if(!GOOD_MULTI_HANDLE(multi))
@@ -1279,7 +1280,8 @@ CURLMcode curl_multi_waitfds(CURLM *m,
   CURLMcode mresult = CURLM_OK;
   struct Curl_multi *multi = m;
   struct easy_pollset ps;
-  unsigned int need = 0, mid;
+  unsigned int need = 0;
+  uint32_t mid;
 
   if(!ufds && (size || !fd_count))
     return CURLM_BAD_FUNCTION_ARGUMENT;
@@ -3758,7 +3760,8 @@ CURL **curl_multi_get_handles(CURLM *m)
   unsigned int count = Curl_uint32_tbl_count(&multi->xfers);
   CURL **a = curlx_malloc(sizeof(struct Curl_easy *) * (count + 1));
   if(a) {
-    unsigned int i = 0, mid;
+    unsigned int i = 0;
+    uint32_t mid;
 
     if(Curl_uint32_tbl_first(&multi->xfers, &mid, &entry)) {
       do {

diff --git a/lib/multiif.h b/lib/multiif.h
index 3695674e4a30b652a98c39672361343ac0f66cc2..15fc070341060ce2858ebcb03ef3fb7990586c43 100644 (file)
--- a/lib/multiif.h
+++ b/lib/multiif.h
@@ -45,7 +45,7 @@ void Curl_multi_connchanged(struct Curl_multi *multi);
 
 /* Internal version of curl_multi_init() accepts size parameters for the
    socket, connection and dns hashes */
-struct Curl_multi *Curl_multi_handle(unsigned int xfer_table_size,
+struct Curl_multi *Curl_multi_handle(uint32_t xfer_table_size,
                                      size_t hashsize,
                                      size_t chashsize,
                                      size_t dnssize,