diff options
| author | Yang Tse <yangsita@gmail.com> | 2011-09-05 20:46:09 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2011-09-05 20:46:09 +0200 |
| commit | a50210710ab6fd772e2762ed36602c15adfb49e1 (patch) | |
| tree | 9ac720a0c9c0b628e1bfeba3b64c5a944e468117 /lib/nonblock.c | |
| parent | eb44ac013832aab80c3ed90292d7b4f25a8a4d75 (diff) | |
| download | curl-a50210710ab6fd772e2762ed36602c15adfb49e1.tar.gz | |
fix bool variables checking and assignment
Diffstat (limited to 'lib/nonblock.c')
| -rw-r--r-- | lib/nonblock.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/nonblock.c b/lib/nonblock.c index 6b023f812..529ce8bca 100644 --- a/lib/nonblock.c +++ b/lib/nonblock.c @@ -62,7 +62,7 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */ /* most recent unix versions */ int flags; flags = fcntl(sockfd, F_GETFL, 0); - if(FALSE != nonblock) + if(nonblock) return fcntl(sockfd, F_SETFL, flags | O_NONBLOCK); else return fcntl(sockfd, F_SETFL, flags & (~O_NONBLOCK)); @@ -70,26 +70,25 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */ #elif defined(HAVE_IOCTL_FIONBIO) /* older unix versions */ - int flags; - flags = nonblock; + int flags = nonblock ? 1 : 0; return ioctl(sockfd, FIONBIO, &flags); #elif defined(HAVE_IOCTLSOCKET_FIONBIO) /* Windows */ - unsigned long flags; - flags = nonblock; + unsigned long flags = nonblock ? 1UL : 0UL; return ioctlsocket(sockfd, FIONBIO, &flags); #elif defined(HAVE_IOCTLSOCKET_CAMEL_FIONBIO) /* Amiga */ - return IoctlSocket(sockfd, FIONBIO, (long)nonblock); + long flags = nonblock ? 1L : 0L; + return IoctlSocket(sockfd, FIONBIO, flags); #elif defined(HAVE_SETSOCKOPT_SO_NONBLOCK) /* BeOS */ - long b = nonblock ? 1 : 0; + long b = nonblock ? 1L : 0L; return setsockopt(sockfd, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b)); #else |