aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2007-02-01 15:36:56 +0000
committerYang Tse <yangsita@gmail.com>2007-02-01 15:36:56 +0000
commitd2dd3d7e16fcebdb34d41c944c5a5aef0d0d8bcf (patch)
treec3e413a5019a6f812a9bf6c37153e933f36529ed /lib
parent1c63ceb317f8bed76edeb63df4d77986f60c8710 (diff)
compiler warning fix
Diffstat (limited to 'lib')
-rw-r--r--lib/ftp.c4
-rw-r--r--lib/sslgen.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index 00aca12ee..479eeffe3 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -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 */
diff --git a/lib/sslgen.c b/lib/sslgen.c
index f110a51ea..5b75c3807 100644
--- a/lib/sslgen.c
+++ b/lib/sslgen.c
@@ -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;