lib: Fix timeval_cmp_margin for 32-bit systems

The test suite compares times with seconds values of -INT_MAX and
INT_MAX. The result of this comparison does not fit in a value of
type int and so the test suite fails on 32-bit systems where time_t
is an int. To fix this, calculations on seconds values are done
using long long integers.

Broken by 16ab5542

diff --git a/src/lib/time-util.c b/src/lib/time-util.c
index 294bb0231012cf5138f816a5286885eb3f400403..3f4cd01c9eda7e8cbc620cb29215b7b9a414ad45 100644 (file)
--- a/src/lib/time-util.c
+++ b/src/lib/time-util.c
@@ -38,21 +38,23 @@ int timeval_cmp(const struct timeval *tv1, const struct timeval *tv2)
 int timeval_cmp_margin(const struct timeval *tv1, const struct timeval *tv2,
        unsigned int usec_margin)
 {
-       long long usecs_diff;
+       long long secs_diff, usecs_diff;
        int sec_margin, ret;
 
        if (tv1->tv_sec < tv2->tv_sec) {
                sec_margin = ((int)usec_margin / 1000000) + 1;
-               if ((tv2->tv_sec - tv1->tv_sec) > sec_margin)
+               secs_diff = (long long)tv2->tv_sec - (long long)tv1->tv_sec;
+               if (secs_diff > sec_margin)
                        return -1;
-               usecs_diff = (tv2->tv_sec - tv1->tv_sec) * 1000000LL +
+               usecs_diff = secs_diff * 1000000LL +
                        (tv2->tv_usec - tv1->tv_usec);
                ret = -1;
        } else if (tv1->tv_sec > tv2->tv_sec) {
                sec_margin = ((int)usec_margin / 1000000) + 1;
-               if ((tv1->tv_sec - tv2->tv_sec) > sec_margin)
+               secs_diff = (long long)tv1->tv_sec - (long long)tv2->tv_sec;
+               if (secs_diff > sec_margin)
                        return 1;
-               usecs_diff = (tv1->tv_sec - tv2->tv_sec) * 1000000LL +
+               usecs_diff = secs_diff * 1000000LL +
                        (tv1->tv_usec - tv2->tv_usec);
                ret = 1;
        } else if (tv1->tv_usec < tv2->tv_usec) {