]> granicus.if.org Git - curl/commitdiff
tests: fix narrowing conversion warnings
authorMarcel Raad <Marcel.Raad@teamviewer.com>
Tue, 24 Sep 2019 16:58:23 +0000 (18:58 +0200)
committerMarcel Raad <Marcel.Raad@teamviewer.com>
Fri, 27 Sep 2019 06:28:10 +0000 (08:28 +0200)
`timediff_t` is 64 bits wide also on 32-bit systems since
commit b1616dad8f0.

Closes https://github.com/curl/curl/pull/4415

tests/unit/unit1303.c
tests/unit/unit1399.c

index b065683a62019096d80bb61858a14c3bd7d32eb1..81f894ee02f144efe4c19de08b1dcaa58dd49ee2 100644 (file)
@@ -68,7 +68,7 @@ struct timetest {
   int timeout_ms;
   int connecttimeout_ms;
   bool connecting;
-  time_t result;
+  timediff_t result;
   const char *comment;
 };
 
@@ -138,7 +138,7 @@ UNITTEST_START
   data->progress.t_startop.tv_usec = 0;
 
   for(i = 0; i < sizeof(run)/sizeof(run[0]); i++) {
-    time_t timeout;
+    timediff_t timeout;
     NOW(run[i].now_s, run[i].now_us);
     TIMEOUTS(run[i].timeout_ms, run[i].connecttimeout_ms);
     timeout =  Curl_timeleft(data, &now, run[i].connecting);
index 7383fbd86e17184cedc955580d53b7f6b773a5cf..170e5b759a2c4f838e08e1b81fa68b813e649f42 100644 (file)
@@ -50,7 +50,7 @@ static void fake_t_startsingle_time(struct Curl_easy *data,
   data->progress.t_startsingle.tv_usec = fake_now.tv_usec;
 }
 
-static bool usec_matches_seconds(time_t time_usec, int expected_seconds)
+static bool usec_matches_seconds(timediff_t time_usec, int expected_seconds)
 {
   int time_sec = (int)(time_usec / usec_magnitude);
   bool same = (time_sec == expected_seconds);