From: Paul Eggert Date: Sun, 5 Mar 2017 04:42:52 +0000 (-0800) Subject: dtotimespec: simplify X-Git-Tag: v1.0~6339 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=19b554f154738b1dd3824b0034af74938a2b6187;p=gnulib.git dtotimespec: simplify * lib/dtotimespec.c (dtotimespec): Simplify. --- diff --git a/ChangeLog b/ChangeLog index 355f5c8c07..861dd6a78f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-03-04 Paul Eggert + + dtotimespec: simplify + * lib/dtotimespec.c (dtotimespec): Simplify. + 2017-03-04 Bruno Haible test-calloc-gnu: Reenable test also for GCC 7. diff --git a/lib/dtotimespec.c b/lib/dtotimespec.c index 9d81b68d81..3ca5a9cfd3 100644 --- a/lib/dtotimespec.c +++ b/lib/dtotimespec.c @@ -29,15 +29,9 @@ struct timespec dtotimespec (double sec) { - double min_representable = TYPE_MINIMUM (time_t); - double max_representable = - ((TYPE_MAXIMUM (time_t) * (double) TIMESPEC_RESOLUTION - + (TIMESPEC_RESOLUTION - 1)) - / TIMESPEC_RESOLUTION); - - if (! (min_representable < sec)) + if (! (TYPE_MINIMUM (time_t) < sec)) return make_timespec (TYPE_MINIMUM (time_t), 0); - else if (! (sec < max_representable)) + else if (! (sec < 1.0 + TYPE_MAXIMUM (time_t))) return make_timespec (TYPE_MAXIMUM (time_t), TIMESPEC_RESOLUTION - 1); else {