summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2019-10-01 00:24:50 +0200
committerMarcel Raad <Marcel.Raad@teamviewer.com>2019-10-01 10:47:37 +0200
commit69d95b6d4c3dce64e58bd36d998ee10ae4da0f34 (patch)
treef6870b27077ed720a3b9fdcca3c443b1781396a2
parent68b0aac2f81251607cf803d92cd29b17388941fb (diff)
downloadcurl-69d95b6d4c3dce64e58bd36d998ee10ae4da0f34.tar.gz
lib: silence conversion warnings
Closes https://github.com/curl/curl/pull/4444
-rw-r--r--lib/hostip.c2
-rw-r--r--lib/vssh/libssh2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/hostip.c b/lib/hostip.c
index bd532a891..d4e8f9366 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -749,7 +749,7 @@ clean_up:
conn->created) / 1000;
/* the alarm period is counted in even number of seconds */
- unsigned long alarm_set = prev_alarm - elapsed_secs;
+ unsigned long alarm_set = (unsigned long)(prev_alarm - elapsed_secs);
if(!alarm_set ||
((alarm_set >= 0x80000000) && (prev_alarm < 0x80000000)) ) {
diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index 6a6793aa3..c71cfbc9f 100644
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -2822,7 +2822,7 @@ static CURLcode ssh_block_statemach(struct connectdata *conn,
fd_write = sock;
/* wait for the socket to become ready */
(void)Curl_socket_check(fd_read, CURL_SOCKET_BAD, fd_write,
- left>1000?1000:left); /* ignore result */
+ left>1000?1000:(time_t)left);
}
#endif