- Benbuck Nason posted the bug report #2835196

  (http://curl.haxx.se/bug/view.cgi?id=2835196), fixing a few compiler
  warnings when mixing ints and bools.

diff --git a/CHANGES b/CHANGES
index 4ade707947df70853da9786c00afe83ecc4532c5..080f0dbe322e26ef877002419455073ab6b85863 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel Stenberg (11 Aug 2009)
+- Benbuck Nason posted the bug report #2835196
+  (http://curl.haxx.se/bug/view.cgi?id=2835196), fixing a few compiler
+  warnings when mixing ints and bools.
+
 Daniel Fandrich (10 Aug 2009)
 - Fixed a memory leak in the FTP code and an off-by-one heap buffer overflow.
 

diff --git a/lib/ftp.c b/lib/ftp.c
index 765ac841c56ebb6189200f77a6a224ca6f7890b7..b68cc027c45454216396319ff71fe4360a174bdc 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -3529,7 +3529,7 @@ static CURLcode ftp_nextconnect(struct connectdata *conn)
 
         /* But only if a body transfer was requested. */
         if(ftp->transfer == FTPTRANSFER_BODY) {
-          result = ftp_nb_type(conn, 1, FTP_LIST_TYPE);
+          result = ftp_nb_type(conn, TRUE, FTP_LIST_TYPE);
           if(result)
             return result;
         }
@@ -4093,7 +4093,7 @@ CURLcode ftp_regular_transfer(struct connectdata *conn,
                               bool *dophase_done)
 {
   CURLcode result=CURLE_OK;
-  bool connected=0;
+  bool connected=FALSE;
   struct SessionHandle *data = conn->data;
   struct ftp_conn *ftpc = &conn->proto.ftpc;
   data->req.size = -1; /* make sure this is unknown at this point */

diff --git a/lib/url.c b/lib/url.c
index 96db7e481ad54450f77fbc18b3a7ef48fa193e81..ae29175485976771aaa550c47e9495f73dac4086 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -3862,7 +3862,7 @@ static CURLcode parse_url_userpass(struct SessionHandle *data,
       if(data->set.use_netrc != CURL_NETRC_REQUIRED) {
         /* We could use the one in the URL */
 
-        conn->bits.user_passwd = 1; /* enable user+password */
+        conn->bits.user_passwd = TRUE; /* enable user+password */
 
         if(*userpass != ':') {
           /* the name is given, get user+password */
@@ -4027,7 +4027,7 @@ static void override_userpass(struct SessionHandle *data,
          different host or similar. */
       conn->bits.netrc = TRUE;
 
-      conn->bits.user_passwd = 1; /* enable user+password */
+      conn->bits.user_passwd = TRUE; /* enable user+password */
     }
   }
 }