moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

multi.c: disambiguate precedence of bitwise and relational operation

This commit is contained in:
Yang Tse 2012-11-26 16:20:53 +01:00
parent 0683adbf50
commit b33074d893
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/multi.c
View File

@ -1017,10 +1017,13 @@ CURLMcode curl_multi_wait(CURLM *multi_handle,
/* Add external file descriptions from poll-like struct curl_waitfd */
for(i = 0; i < extra_nfds; i++) {
ufds[nfds].fd = extra_fds[i].fd;
ufds[nfds].events = (short) (
((extra_fds[i].events & CURL_WAIT_POLLIN) ? POLLIN : 0) |
((extra_fds[i].events & CURL_WAIT_POLLPRI) ? POLLPRI : 0) |
((extra_fds[i].events & CURL_WAIT_POLLOUT) ? POLLOUT : 0) );
ufds[nfds].events = 0;
if(extra_fds[i].events & CURL_WAIT_POLLIN)
ufds[nfds].events |= POLLIN;
if(extra_fds[i].events & CURL_WAIT_POLLPRI)
ufds[nfds].events |= POLLPRI;
if(extra_fds[i].events & CURL_WAIT_POLLOUT)
ufds[nfds].events |= POLLOUT;
++nfds;
}