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

loadhostpairs: return errorcode

Browse Source 
Make sure that Curl_cache_addr() errors are propagated to callers of
loadhostpairs().

(this loadhostpairs function caused a scan-build warning due to the
'dns' variable getting assigned but never used)
This commit is contained in:
Daniel Stenberg 2010-12-20 22:17:41 +01:00
parent 1e739e781e
commit af54fbbcb5
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/transfer.c
View File

@ -1382,7 +1382,7 @@ Transfer(struct connectdata *conn)
return CURLE_OK;
}
static void loadhostpairs(struct SessionHandle *data)
static CURLcode loadhostpairs(struct SessionHandle *data)
{
struct curl_slist *hostp;
char hostname[256];
@ -1393,7 +1393,7 @@ static void loadhostpairs(struct SessionHandle *data)
if(!hostp->data)
continue;
if(hostp->data[0] == '-') {
/* mark an entry for removal */
/* TODO: mark an entry for removal */
}
else if(3 == sscanf(hostp->data, "%255[^:]:%d:%255s", hostname, &port,
address)) {
@ -1416,9 +1416,14 @@ static void loadhostpairs(struct SessionHandle *data)
if(data->share)
Curl_share_unlock(data, CURL_LOCK_DATA_DNS);
if(!dns)
return CURLE_OUT_OF_MEMORY;
}
}
data->change.resolve = NULL; /* dealt with now */
return CURLE_OK;
}
@ -1460,31 +1465,33 @@ CURLcode Curl_pretransfer(struct SessionHandle *data)
/* If there is a list of host pairs to deal with */
if(data->change.resolve)
loadhostpairs(data);
res = loadhostpairs(data);
/* Allow data->set.use_port to set which port to use. This needs to be
* disabled for example when we follow Location: headers to URLs using
* different ports! */
data->state.allow_port = TRUE;
if(!res) {
/* Allow data->set.use_port to set which port to use. This needs to be
* disabled for example when we follow Location: headers to URLs using
* different ports! */
data->state.allow_port = TRUE;
#if defined(HAVE_SIGNAL) && defined(SIGPIPE) && !defined(HAVE_MSG_NOSIGNAL)
/*************************************************************
* Tell signal handler to ignore SIGPIPE
*************************************************************/
if(!data->set.no_signal)
data->state.prev_signal = signal(SIGPIPE, SIG_IGN);
/*************************************************************
* Tell signal handler to ignore SIGPIPE
*************************************************************/
if(!data->set.no_signal)
data->state.prev_signal = signal(SIGPIPE, SIG_IGN);
#endif
Curl_initinfo(data); /* reset session-specific information "variables" */
Curl_pgrsStartNow(data);
Curl_initinfo(data); /* reset session-specific information "variables" */
Curl_pgrsStartNow(data);
if(data->set.timeout)
Curl_expire(data, data->set.timeout);
if(data->set.timeout)
Curl_expire(data, data->set.timeout);
if(data->set.connecttimeout)
Curl_expire(data, data->set.connecttimeout);
if(data->set.connecttimeout)
Curl_expire(data, data->set.connecttimeout);
}
return CURLE_OK;
return res;
}
/*