mirror of
https://github.com/moparisthebest/curl
synced 2024-11-11 03:55:03 -05:00
removed running_handles argument from multi_runsingle() since it wasn't really
used anymore since multi->num_alive was introduced
This commit is contained in:
parent
d211fcd34f
commit
01a79be2c9
10
lib/multi.c
10
lib/multi.c
@ -540,8 +540,7 @@ CURLMcode curl_multi_fdset(CURLM *multi_handle,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static CURLMcode multi_runsingle(struct Curl_multi *multi,
|
static CURLMcode multi_runsingle(struct Curl_multi *multi,
|
||||||
struct Curl_one_easy *easy,
|
struct Curl_one_easy *easy)
|
||||||
int *running_handles)
|
|
||||||
{
|
{
|
||||||
struct Curl_message *msg = NULL;
|
struct Curl_message *msg = NULL;
|
||||||
bool connected;
|
bool connected;
|
||||||
@ -935,7 +934,6 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
|
|||||||
multi->num_msgs++; /* increase message counter */
|
multi->num_msgs++; /* increase message counter */
|
||||||
}
|
}
|
||||||
|
|
||||||
*running_handles = multi->num_alive;
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -952,7 +950,7 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles)
|
|||||||
|
|
||||||
easy=multi->easy.next;
|
easy=multi->easy.next;
|
||||||
while(easy) {
|
while(easy) {
|
||||||
CURLMcode result = multi_runsingle(multi, easy, running_handles);
|
CURLMcode result = multi_runsingle(multi, easy);
|
||||||
if(result)
|
if(result)
|
||||||
returncode = result;
|
returncode = result;
|
||||||
|
|
||||||
@ -1198,7 +1196,7 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
|
|||||||
|
|
||||||
data = entry->easy;
|
data = entry->easy;
|
||||||
|
|
||||||
result = multi_runsingle(multi, data->set.one_easy, running_handles);
|
result = multi_runsingle(multi, data->set.one_easy);
|
||||||
|
|
||||||
if(result == CURLM_OK)
|
if(result == CURLM_OK)
|
||||||
/* get the socket(s) and check if the state has been changed since
|
/* get the socket(s) and check if the state has been changed since
|
||||||
@ -1222,7 +1220,7 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
|
|||||||
|
|
||||||
/* the first loop lap 'data' can be NULL */
|
/* the first loop lap 'data' can be NULL */
|
||||||
if(data) {
|
if(data) {
|
||||||
result = multi_runsingle(multi, data->set.one_easy, running_handles);
|
result = multi_runsingle(multi, data->set.one_easy);
|
||||||
|
|
||||||
if(result == CURLM_OK)
|
if(result == CURLM_OK)
|
||||||
/* get the socket(s) and check if the state has been changed since
|
/* get the socket(s) and check if the state has been changed since
|
||||||
|
Loading…
Reference in New Issue
Block a user