moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 12:05:06 -05:00
Code Issues Releases Wiki Activity

asyn-thread: We prefer 'CURLcode result'

Browse Source
This commit is contained in:
Steve Holme 2014-12-14 12:52:08 +00:00
parent 35fae251dd
commit 4d2c539b6c
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/asyn-thread.c
View File

@ -434,19 +434,21 @@ static bool init_resolve_thread (struct connectdata *conn,
static CURLcode resolver_error(struct connectdata *conn) static CURLcode resolver_error(struct connectdata *conn)
{ {
const char *host_or_proxy; const char *host_or_proxy;
CURLcode rc; CURLcode result;
if(conn->bits.httpproxy) { if(conn->bits.httpproxy) {
host_or_proxy = "proxy"; host_or_proxy = "proxy";
rc = CURLE_COULDNT_RESOLVE_PROXY; result = CURLE_COULDNT_RESOLVE_PROXY;
} }
else { else {
host_or_proxy = "host"; host_or_proxy = "host";
rc = CURLE_COULDNT_RESOLVE_HOST; result = CURLE_COULDNT_RESOLVE_HOST;
} }
failf(conn->data, "Could not resolve %s: %s", host_or_proxy, failf(conn->data, "Could not resolve %s: %s", host_or_proxy,
conn->async.hostname); conn->async.hostname);
return rc;
return result;
} }
/* /*
@ -463,13 +465,13 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn,
struct Curl_dns_entry **entry) struct Curl_dns_entry **entry)
{ {
struct thread_data *td = (struct thread_data*) conn->async.os_specific; struct thread_data *td = (struct thread_data*) conn->async.os_specific;
CURLcode rc = CURLE_OK; CURLcode result = CURLE_OK;
DEBUGASSERT(conn && td); DEBUGASSERT(conn && td);
/* wait for the thread to resolve the name */ /* wait for the thread to resolve the name */
if(Curl_thread_join(&td->thread_hnd)) if(Curl_thread_join(&td->thread_hnd))
rc = getaddrinfo_complete(conn); result = getaddrinfo_complete(conn);
else else
DEBUGASSERT(0); DEBUGASSERT(0);
@ -480,14 +482,14 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn,
if(!conn->async.dns) if(!conn->async.dns)
/* a name was not resolved, report error */ /* a name was not resolved, report error */
rc = resolver_error(conn); result = resolver_error(conn);
destroy_async_data(&conn->async); destroy_async_data(&conn->async);
if(!conn->async.dns) if(!conn->async.dns)
connclose(conn, "asynch resolve failed"); connclose(conn, "asynch resolve failed");
return (rc); return result;
} }
/* /*
@ -517,9 +519,9 @@ CURLcode Curl_resolver_is_resolved(struct connectdata *conn,
getaddrinfo_complete(conn); getaddrinfo_complete(conn);
if(!conn->async.dns) { if(!conn->async.dns) {
CURLcode rc = resolver_error(conn); CURLcode result = resolver_error(conn);
destroy_async_data(&conn->async); destroy_async_data(&conn->async);
return rc; return result;
} }
destroy_async_data(&conn->async); destroy_async_data(&conn->async);
*entry = conn->async.dns; *entry = conn->async.dns;