diff --git a/lib/connect.c b/lib/connect.c
index 35c3d485555a4164d09d1e35c8e61d4e73681705..1d2947488c53e6bc3ab1b6a025b32f39570adaf2 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 d34663013706882ccba14414c010789cb94c6396..6a9573ab5740185bf66f73da15ef855754ee8500 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 cb0bffce472b07741068db98d0287b61520fb515..e2afd7170fb88d51bc7c6d904a951891b85cbac4 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 55f3e67b2a3d28e47eb053cd78493501b7615ede..a1ead128f6565a23e9f2b6e9407cbdee5d4532e3 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 f2af18311754ebb768a3a41d48e89ba4891e4d0f..335bfe03b64382e0746e66a6315c958b56d1e1b3 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 ee80f47e6699d94fd45c3501e407d91005c9f965..b8a77fc3af83b5a26d3dca0310648ae4bc3d643e 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);