From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 12 Jul 2022 21:06:01 +0000 (+0200)
Subject: asyn-thread: make getaddrinfo_complete return CURLcode
X-Git-Tag: curl-7_85_0~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=451bcc1a9187e0cfaca6a346e5e55695b68e1851;p=thirdparty%2Fcurl.git

asyn-thread: make getaddrinfo_complete return CURLcode

... as the only caller that cares about what it returns assumes that
anyway. This caused icc to warn:

asyn-thread.c(505): error #188: enumerated type mixed with another type
        result = getaddrinfo_complete(data);

Repoorted-by: Matthew Thompson
Bug: https://github.com/curl/curl/issues/9081#issuecomment-1182143076
Closes #9146
---

diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
index d0edc32608..92c38f266a 100644
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@@ -269,18 +269,18 @@ int init_thread_sync_data(struct thread_data *td,
   return 0;
 }
 
-static int getaddrinfo_complete(struct Curl_easy *data)
+static CURLcode getaddrinfo_complete(struct Curl_easy *data)
 {
   struct thread_sync_data *tsd = conn_thread_sync_data(data);
-  int rc;
+  CURLcode result;
 
-  rc = Curl_addrinfo_callback(data, tsd->sock_error, tsd->res);
+  result = Curl_addrinfo_callback(data, tsd->sock_error, tsd->res);
   /* The tsd->res structure has been copied to async.dns and perhaps the DNS
      cache.  Set our copy to NULL so destroy_thread_sync_data doesn't free it.
   */
   tsd->res = NULL;
 
-  return rc;
+  return result;
 }