]> granicus.if.org Git - curl/commitdiff
lib: silence conversion warnings
authorMarcel Raad <Marcel.Raad@teamviewer.com>
Mon, 30 Sep 2019 22:24:50 +0000 (00:24 +0200)
committerMarcel Raad <Marcel.Raad@teamviewer.com>
Tue, 1 Oct 2019 08:47:37 +0000 (10:47 +0200)
Closes https://github.com/curl/curl/pull/4444

lib/hostip.c
lib/vssh/libssh2.c

index bd532a891edf03b43f01608c26a10e30020e11ca..d4e8f9366a73500f39d9e26a7ed5c54a31e3a512 100644 (file)
@@ -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)) ) {
index 6a6793aa3fda6511f49e2d53e0857225df183d3f..c71cfbc9fd4b91cc4e5a6c2d452d584a5e76e0a8 100644 (file)
@@ -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