code cleanup: Use 'CURLcode result'

This commit is contained in:
Steve Holme
2014-10-30 23:14:45 +00:00
parent a9db36d1fd
commit befbc8f56b
3 changed files with 23 additions and 23 deletions

View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -75,7 +75,7 @@ CURLcode Curl_addrinfo_callback(struct connectdata *conn,
struct Curl_addrinfo *ai)
{
struct Curl_dns_entry *dns = NULL;
CURLcode rc = CURLE_OK;
CURLcode result = CURLE_OK;
conn->async.status = status;
@@ -92,14 +92,14 @@ CURLcode Curl_addrinfo_callback(struct connectdata *conn,
if(!dns) {
/* failed to store, cleanup and return error */
Curl_freeaddrinfo(ai);
rc = CURLE_OUT_OF_MEMORY;
result = CURLE_OUT_OF_MEMORY;
}
if(data->share)
Curl_share_unlock(data, CURL_LOCK_DATA_DNS);
}
else {
rc = CURLE_OUT_OF_MEMORY;
result = CURLE_OUT_OF_MEMORY;
}
}
@@ -112,7 +112,7 @@ CURLcode Curl_addrinfo_callback(struct connectdata *conn,
/* ipv4: The input hostent struct will be freed by ares when we return from
this function */
return rc;
return result;
}
/* Call this function after Curl_connect() has returned async=TRUE and