Dan Fandrich fix: eliminates some pedantic CodeWarrior compiler warnings and

errors.

diff --git a/lib/hostip.c b/lib/hostip.c
index 7bb8c966cc3b2fb98337a4fc2ed92fbca69a7992..fc72cb8c3c78b06cb0ef412682cb299f86cb3e5e 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -174,7 +174,8 @@ void Curl_global_host_cache_dtor(void)
 int Curl_num_addresses(const Curl_addrinfo *addr)
 {
   int i;
-  for (i = 0; addr; addr = addr->ai_next, i++);
+  for (i = 0; addr; addr = addr->ai_next, i++)
+    ;  /* empty loop */
   return i;
 }
 

diff --git a/lib/telnet.c b/lib/telnet.c
index a2208f67a33e72fb0d065b9b8ad1c547469ed2e2..fb8487a2bcc39166fee058a9d7b5a388e77e3713 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -298,7 +298,7 @@ static void send_negotiation(struct connectdata *conn, int cmd, int option)
    buf[1] = cmd;
    buf[2] = option;
 
-   (void)swrite(conn->sock[FIRSTSOCKET], buf, 3);
+   (void)swrite(conn->sock[FIRSTSOCKET], (char *)buf, 3);
 
    printoption(conn->data, "SENT", cmd, option);
 }
@@ -861,7 +861,7 @@ static void suboption(struct connectdata *conn)
       snprintf((char *)temp, sizeof(temp),
                "%c%c%c%c%s%c%c", CURL_IAC, CURL_SB, CURL_TELOPT_TTYPE,
                CURL_TELQUAL_IS, tn->subopt_ttype, CURL_IAC, CURL_SE);
-      (void)swrite(conn->sock[FIRSTSOCKET], temp, len);
+      (void)swrite(conn->sock[FIRSTSOCKET], (char *)temp, len);
       printsub(data, '>', &temp[2], len-2);
       break;
     case CURL_TELOPT_XDISPLOC:
@@ -869,7 +869,7 @@ static void suboption(struct connectdata *conn)
       snprintf((char *)temp, sizeof(temp),
                "%c%c%c%c%s%c%c", CURL_IAC, CURL_SB, CURL_TELOPT_XDISPLOC,
                CURL_TELQUAL_IS, tn->subopt_xdisploc, CURL_IAC, CURL_SE);
-      (void)swrite(conn->sock[FIRSTSOCKET], temp, len);
+      (void)swrite(conn->sock[FIRSTSOCKET], (char *)temp, len);
       printsub(data, '>', &temp[2], len-2);
       break;
     case CURL_TELOPT_NEW_ENVIRON:
@@ -892,7 +892,7 @@ static void suboption(struct connectdata *conn)
       snprintf((char *)&temp[len], sizeof(temp) - len,
                "%c%c", CURL_IAC, CURL_SE);
       len += 2;
-      (void)swrite(conn->sock[FIRSTSOCKET], temp, len);
+      (void)swrite(conn->sock[FIRSTSOCKET], (char *)temp, len);
       printsub(data, '>', &temp[2], len-2);
       break;
   }

diff --git a/lib/transfer.c b/lib/transfer.c
index 389ed6e16e350e6bba7c99bed39df02c5b015e79..79ecc02b8b6aaa33bc009684990fcc1521b03f5f 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -697,7 +697,8 @@ CURLcode Curl_readwrite(struct connectdata *conn,
               /* Find the first non-space letter */
               for(start=k->p+13;
                   *start && isspace((int)*start);
-                  start++);
+                  start++)
+                ;  /* empty loop */
 
               end = strchr(start, '\r');
               if(!end)
@@ -705,7 +706,8 @@ CURLcode Curl_readwrite(struct connectdata *conn,
 
               if(end) {
                 /* skip all trailing space letters */
-                for(; isspace((int)*end) && (end > start); end--);
+                for(; isspace((int)*end) && (end > start); end--)
+                  ;  /* empty loop */
 
                 /* get length of the type */
                 len = end-start+1;
@@ -796,7 +798,8 @@ CURLcode Curl_readwrite(struct connectdata *conn,
               /* Find the first non-space letter */
               for(start=k->p+17;
                   *start && isspace((int)*start);
-                  start++);
+                  start++)
+                ;  /* empty loop */
 
               /* Record the content-encoding for later use */
               if (checkprefix("identity", start))

diff --git a/lib/url.c b/lib/url.c
index 6ee238360bf57aa54aefb0e63c5915dd53aee147..882d74719796e7f322446fc915f8edfcb1803d95 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -206,7 +206,8 @@ void Curl_safefree(void *ptr)
 CURLcode Curl_close(struct SessionHandle *data)
 {
   /* Loop through all open connections and kill them one by one */
-  while(-1 != ConnectionKillOne(data));
+  while(-1 != ConnectionKillOne(data))
+    ; /* empty loop */
 
   if ( ! (data->share && data->share->hostcache) ) {
     if ( !Curl_global_host_cache_use(data)) {