]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
cURL: Fix type conflation with curl_multi_add_handle()
authorTerry Burton <tez@terryburton.co.uk>
Fri, 8 May 2020 15:40:14 +0000 (16:40 +0100)
committerAlan DeKok <aland@freeradius.org>
Fri, 8 May 2020 18:25:45 +0000 (14:25 -0400)
src/lib/curl/io.c

index f0bd5a026ff2fb099407887aab00fd29d0e9fade..03abfdc99451dbdfea13c0a3a5a5a953ad14dd8a 100644 (file)
@@ -372,6 +372,7 @@ static int _fr_curl_io_event_modify(UNUSED CURL *easy, curl_socket_t fd, int wha
 int fr_curl_io_request_enqueue(fr_curl_handle_t *mhandle, REQUEST *request, fr_curl_io_request_t *randle)
 {
        CURLcode                ret;
+       CURLMcode               mret;
 
        REQUEST_VERIFY(request);
 
@@ -394,10 +395,10 @@ int fr_curl_io_request_enqueue(fr_curl_handle_t *mhandle, REQUEST *request, fr_c
         *      event loop modifications calls immediately.
         */
        mhandle->transfers++;
-       ret = curl_multi_add_handle(mhandle->mandle, randle->candle);
-       if (ret != CURLE_OK) {
+       mret = curl_multi_add_handle(mhandle->mandle, randle->candle);
+       if (mret != CURLM_OK) {
                mhandle->transfers--;
-               REDEBUG("Request failed: %i - %s", ret, curl_easy_strerror(ret));
+               REDEBUG("Request failed: %i - %s", mret, curl_multi_strerror(mret));
                return -1;
        }