In MSVC9 'time_t' is a 64-bit quantity. This causes a truncation warning
when an 'int' is assigned to a 'time_t' variable. Hence redefine 'retry_time' and 'retry_max' to 'time_t'.
This commit is contained in:
@@ -140,8 +140,8 @@ typedef struct tftp_state_data {
|
|||||||
struct connectdata *conn;
|
struct connectdata *conn;
|
||||||
curl_socket_t sockfd;
|
curl_socket_t sockfd;
|
||||||
int retries;
|
int retries;
|
||||||
int retry_time;
|
time_t retry_time;
|
||||||
int retry_max;
|
time_t retry_max;
|
||||||
time_t start_time;
|
time_t start_time;
|
||||||
time_t max_time;
|
time_t max_time;
|
||||||
unsigned short block;
|
unsigned short block;
|
||||||
@@ -973,7 +973,7 @@ static CURLcode tftp_do(struct connectdata *conn, bool *done)
|
|||||||
|
|
||||||
/* Wait until ready to read or timeout occurs */
|
/* Wait until ready to read or timeout occurs */
|
||||||
rc=Curl_socket_ready(state->sockfd, CURL_SOCKET_BAD,
|
rc=Curl_socket_ready(state->sockfd, CURL_SOCKET_BAD,
|
||||||
state->retry_time * 1000);
|
(int)(state->retry_time * 1000));
|
||||||
|
|
||||||
if(rc == -1) {
|
if(rc == -1) {
|
||||||
/* bail out */
|
/* bail out */
|
||||||
|
Reference in New Issue
Block a user