generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multi: shorten lines

Browse Source 
We keep them less than 80 columns
This commit is contained in:
Daniel Stenberg
2011-04-03 00:07:32 +02:00
parent c2459c4328
commit 318c5c802b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/multi.c
View File

@@ -872,7 +872,8 @@ static int multi_getsock(struct Curl_one_easy *easy,
return domore_getsock(easy->easy_conn, socks, numsocks); return domore_getsock(easy->easy_conn, socks, numsocks);
case CURLM_STATE_DO_DONE: /* since is set after DO is completed, we switch case CURLM_STATE_DO_DONE: /* since is set after DO is completed, we switch
to waiting for the same as the *PERFORM states */ to waiting for the same as the *PERFORM
states */
case CURLM_STATE_PERFORM: case CURLM_STATE_PERFORM:
case CURLM_STATE_WAITPERFORM: case CURLM_STATE_WAITPERFORM:
return Curl_single_getsock(easy->easy_conn, socks, numsocks); return Curl_single_getsock(easy->easy_conn, socks, numsocks);
@@ -1769,7 +1770,7 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
for(i=0; i< multi->connc->num; i++) { for(i=0; i< multi->connc->num; i++) {
if(multi->connc->connects[i] && if(multi->connc->connects[i] &&
multi->connc->connects[i]->handler->flags & PROTOPT_CLOSEACTION) { multi->connc->connects[i]->handler->flags & PROTOPT_CLOSEACTION) {
Curl_disconnect(multi->connc->connects[i], /* dead_connection */ FALSE); Curl_disconnect(multi->connc->connects[i], FALSE);
multi->connc->connects[i] = NULL; multi->connc->connects[i] = NULL;
} }
} }
@@ -2125,7 +2126,8 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
data = data->set.one_easy->easy_conn->recv_pipe->head->ptr; data = data->set.one_easy->easy_conn->recv_pipe->head->ptr;
} }
if(data->set.one_easy->easy_conn && !(data->set.one_easy->easy_conn->handler->flags & PROTOPT_DIRLOCK)) if(data->set.one_easy->easy_conn &&
!(data->set.one_easy->easy_conn->handler->flags & PROTOPT_DIRLOCK))
/* set socket event bitmask if they're not locked */ /* set socket event bitmask if they're not locked */
data->set.one_easy->easy_conn->cselect_bits = ev_bitmask; data->set.one_easy->easy_conn->cselect_bits = ev_bitmask;
@@ -2133,7 +2135,8 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
result = multi_runsingle(multi, now, data->set.one_easy); result = multi_runsingle(multi, now, data->set.one_easy);
while (CURLM_CALL_MULTI_PERFORM == result); while (CURLM_CALL_MULTI_PERFORM == result);
if(data->set.one_easy->easy_conn && !(data->set.one_easy->easy_conn->handler->flags & PROTOPT_DIRLOCK)) if(data->set.one_easy->easy_conn &&
!(data->set.one_easy->easy_conn->handler->flags & PROTOPT_DIRLOCK))
/* clear the bitmask only if not locked */ /* clear the bitmask only if not locked */
data->set.one_easy->easy_conn->cselect_bits = 0; data->set.one_easy->easy_conn->cselect_bits = 0;