aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2010-02-02 16:25:07 +0000
committerYang Tse <yangsita@gmail.com>2010-02-02 16:25:07 +0000
commitd1717e7c9079a5f2b6291fa1fefe95d1348f8cc5 (patch)
tree708af8d09980a0bb3bd6d00a7a6406232dcf1607
parente569ff959fb5be62e47eec38fec7d97014bf785f (diff)
Fix compiler warning: conditional expression is constant
-rw-r--r--lib/connect.c6
-rw-r--r--lib/ftp.c2
-rw-r--r--lib/sendf.c2
-rw-r--r--lib/socks.c4
-rw-r--r--lib/telnet.c4
-rw-r--r--lib/transfer.c4
6 files changed, 11 insertions, 11 deletions
diff --git a/lib/connect.c b/lib/connect.c
index 35c3d4855..1d2947488 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -205,7 +205,7 @@ int waitconnect(struct connectdata *conn,
(void)verifyconnect(sockfd, NULL);
#endif
- while(1) {
+ for(;;) {
/* now select() until we get connect or timeout */
rc = Curl_socket_ready(CURL_SOCKET_BAD, sockfd, (int)(timeout_msec>1000?
@@ -385,7 +385,7 @@ static CURLcode bindlocal(struct connectdata *conn,
}
}
- do {
+ for(;;) {
if( bind(sockfd, sock, sizeof_sa) >= 0) {
/* we succeeded to bind */
struct Curl_sockaddr_storage add;
@@ -415,7 +415,7 @@ static CURLcode bindlocal(struct connectdata *conn,
}
else
break;
- } while(1);
+ }
data->state.os_errno = error = SOCKERRNO;
failf(data, "bind failed with errno %d: %s",
diff --git a/lib/ftp.c b/lib/ftp.c
index d34663013..6a9573ab5 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -3488,7 +3488,7 @@ CURLcode Curl_ftpsendf(struct connectdata *conn,
}
#endif /* CURL_DOES_CONVERSIONS */
- while(1) {
+ for(;;) {
#if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
conn->data_prot = prot_cmd;
#endif
diff --git a/lib/sendf.c b/lib/sendf.c
index cb0bffce4..e2afd7170 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -210,7 +210,7 @@ CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *conn,
write_len = strlen(s);
sptr = s;
- while(1) {
+ for(;;) {
/* Write the buffer to the socket */
res = Curl_write(conn, sockfd, sptr, write_len, &bytes_written);
diff --git a/lib/socks.c b/lib/socks.c
index 55f3e67b2..a1ead128f 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -72,7 +72,7 @@ int Curl_blockread_all(struct connectdata *conn, /* connection data */
struct timeval tvnow;
long conntime;
*n = 0;
- do {
+ for(;;) {
tvnow = Curl_tvnow();
/* calculating how long connection is establishing */
conntime = Curl_tvdiff(tvnow, conn->created);
@@ -104,7 +104,7 @@ int Curl_blockread_all(struct connectdata *conn, /* connection data */
buffersize -= nread;
buf += nread;
allread += nread;
- } while(1);
+ }
return result;
}
diff --git a/lib/telnet.c b/lib/telnet.c
index f2af18311..335bfe03b 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1325,7 +1325,7 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done)
switch(waitret) {
case WAIT_TIMEOUT:
{
- while(1) {
+ for(;;) {
if(!PeekNamedPipe(stdin_handle, NULL, 0, NULL, &readfile_read, NULL)) {
keepon = FALSE;
code = CURLE_READ_ERROR;
diff --git a/lib/transfer.c b/lib/transfer.c
index ee80f47e6..b8a77fc3a 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -1949,7 +1949,7 @@ CURLcode Curl_perform(struct SessionHandle *data)
* performed after this do-while loop.
*/
- do {
+ for(;;) {
res = connect_host(data, &conn); /* primary connection */
if(res == CURLE_OK) {
@@ -2052,7 +2052,7 @@ CURLcode Curl_perform(struct SessionHandle *data)
}
break; /* it only reaches here when this shouldn't loop */
- } while(1); /* loop if Location: */
+ } /* loop if Location: */
if(newurl)
free(newurl);