compiler warning fix

This commit is contained in:
Yang Tse 2007-02-01 15:36:56 +00:00
parent 1c63ceb317
commit d2dd3d7e16
5 changed files with 11 additions and 9 deletions

View file

@ -1586,7 +1586,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
}
}
if(ptr) {
newport = num;
newport = (unsigned short)(num & 0xffff);
if (conn->bits.tunnel_proxy)
/* proxy tunnel -> use other host info because ip_addr_str is the
@ -1650,7 +1650,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
else
snprintf(newhost, sizeof(newhost),
"%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
newport = (port[0]<<8) + port[1];
newport = (unsigned short)(((port[0]<<8) + port[1]) & 0xffff);
}
else if(ftpc->count1 == 0) {
/* EPSV failed, move on to PASV */

View file

@ -608,7 +608,7 @@ bool Curl_ssl_data_pending(struct connectdata *conn,
/* OpenSSL-specific */
if(conn->ssl[connindex].handle)
/* SSL is in use */
return SSL_pending(conn->ssl[connindex].handle);
return (bool)(0 != SSL_pending(conn->ssl[connindex].handle));
#else
(void)conn;
(void)connindex;