Commit 8511b643 authored by Stefan Krause's avatar Stefan Krause Committed by Kamil Dudka
Browse files

transfer: avoid insane conversion of time_t

parent 17de1cc3

lib/file.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static CURLcode file_do(struct connectdata *conn, bool *done) 
  }



  if(fstated && !data->state.range && data->set.timecondition) {

    if(!Curl_meets_timecondition(data, data->info.filetime)) {

    if(!Curl_meets_timecondition(data, (time_t)data->info.filetime)) {

      *done = TRUE;

      return CURLE_OK;

    }

lib/transfer.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static void read_rewind(struct connectdata *conn, 
 * Check to see if CURLOPT_TIMECONDITION was met by comparing the time of the

 * remote document with the time provided by CURLOPT_TIMEVAL

 */

bool Curl_meets_timecondition(struct SessionHandle *data, long timeofdoc)

bool Curl_meets_timecondition(struct SessionHandle *data, time_t timeofdoc)

{

  if((timeofdoc == 0) || (data->set.timevalue == 0))

    return TRUE;

lib/transfer.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ CURLcode Curl_readrewind(struct connectdata *conn); 
CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp);

CURLcode Curl_reconnect_request(struct connectdata **connp);

CURLcode Curl_retry_request(struct connectdata *conn, char **url);

bool Curl_meets_timecondition(struct SessionHandle *data, long timeofdoc);

bool Curl_meets_timecondition(struct SessionHandle *data, time_t timeofdoc);



/* This sets up a forthcoming transfer */

void