hostasyn: Prefer 'CURLcode result' for curl result codes
This commit is contained in:
parent
28c9e1edf4
commit
0ebe2c15d1
@ -5,7 +5,7 @@
|
|||||||
* | (__| |_| | _ <| |___
|
* | (__| |_| | _ <| |___
|
||||||
* \___|\___/|_| \_\_____|
|
* \___|\___/|_| \_\_____|
|
||||||
*
|
*
|
||||||
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
|
* Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||||
*
|
*
|
||||||
* This software is licensed as described in the file COPYING, which
|
* This software is licensed as described in the file COPYING, which
|
||||||
* you should have received as part of this distribution. The terms
|
* you should have received as part of this distribution. The terms
|
||||||
@ -123,21 +123,21 @@ CURLcode Curl_addrinfo_callback(struct connectdata *conn,
|
|||||||
CURLcode Curl_async_resolved(struct connectdata *conn,
|
CURLcode Curl_async_resolved(struct connectdata *conn,
|
||||||
bool *protocol_done)
|
bool *protocol_done)
|
||||||
{
|
{
|
||||||
CURLcode code;
|
CURLcode result;
|
||||||
|
|
||||||
if(conn->async.dns) {
|
if(conn->async.dns) {
|
||||||
conn->dns_entry = conn->async.dns;
|
conn->dns_entry = conn->async.dns;
|
||||||
conn->async.dns = NULL;
|
conn->async.dns = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
code = Curl_setup_conn(conn, protocol_done);
|
result = Curl_setup_conn(conn, protocol_done);
|
||||||
|
|
||||||
if(code)
|
if(result)
|
||||||
/* We're not allowed to return failure with memory left allocated
|
/* We're not allowed to return failure with memory left allocated
|
||||||
in the connectdata struct, free those here */
|
in the connectdata struct, free those here */
|
||||||
Curl_disconnect(conn, FALSE); /* close the connection */
|
Curl_disconnect(conn, FALSE); /* close the connection */
|
||||||
|
|
||||||
return code;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user