[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2b1dc8c: Update from Gnulib
From: |
Paul Eggert |
Subject: |
master 2b1dc8c: Update from Gnulib |
Date: |
Wed, 6 Nov 2019 01:59:32 -0500 (EST) |
branch: master
commit 2b1dc8c26e243d4eb9eeac0ddadd6b59d0b9f072
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Update from Gnulib
This incorporates:
2019-10-24 timespec-add, timespec-sub: simplify
* lib/timespec-add.c, lib/timespec-sub.c:
Copy from Gnulib.
---
lib/timespec-add.c | 20 +++++++-------------
lib/timespec-sub.c | 20 +++++++-------------
2 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/lib/timespec-add.c b/lib/timespec-add.c
index e0a9f12..abee154 100644
--- a/lib/timespec-add.c
+++ b/lib/timespec-add.c
@@ -33,36 +33,30 @@ timespec_add (struct timespec a, struct timespec b)
int ns = a.tv_nsec + b.tv_nsec;
int nsd = ns - TIMESPEC_HZ;
int rns = ns;
- time_t tmin = TYPE_MINIMUM (time_t);
- time_t tmax = TYPE_MAXIMUM (time_t);
if (0 <= nsd)
{
rns = nsd;
- if (bs < tmax)
- bs++;
+ time_t bs1;
+ if (!INT_ADD_WRAPV (bs, 1, &bs1))
+ bs = bs1;
else if (rs < 0)
rs++;
else
goto high_overflow;
}
- /* INT_ADD_WRAPV is not appropriate since time_t might be unsigned.
- In theory time_t might be narrower than int, so plain
- INT_ADD_OVERFLOW does not suffice. */
- if (! INT_ADD_OVERFLOW (rs, bs) && tmin <= rs + bs && rs + bs <= tmax)
- rs += bs;
- else
+ if (INT_ADD_WRAPV (rs, bs, &rs))
{
- if (rs < 0)
+ if (bs < 0)
{
- rs = tmin;
+ rs = TYPE_MINIMUM (time_t);
rns = 0;
}
else
{
high_overflow:
- rs = tmax;
+ rs = TYPE_MAXIMUM (time_t);
rns = TIMESPEC_HZ - 1;
}
}
diff --git a/lib/timespec-sub.c b/lib/timespec-sub.c
index 48434e8..77b9353 100644
--- a/lib/timespec-sub.c
+++ b/lib/timespec-sub.c
@@ -33,36 +33,30 @@ timespec_sub (struct timespec a, struct timespec b)
time_t bs = b.tv_sec;
int ns = a.tv_nsec - b.tv_nsec;
int rns = ns;
- time_t tmin = TYPE_MINIMUM (time_t);
- time_t tmax = TYPE_MAXIMUM (time_t);
if (ns < 0)
{
rns = ns + TIMESPEC_HZ;
- if (bs < tmax)
- bs++;
+ time_t bs1;
+ if (!INT_ADD_WRAPV (bs, 1, &bs1))
+ bs = bs1;
else if (- TYPE_SIGNED (time_t) < rs)
rs--;
else
goto low_overflow;
}
- /* INT_SUBTRACT_WRAPV is not appropriate since time_t might be unsigned.
- In theory time_t might be narrower than int, so plain
- INT_SUBTRACT_OVERFLOW does not suffice. */
- if (! INT_SUBTRACT_OVERFLOW (rs, bs) && tmin <= rs - bs && rs - bs <= tmax)
- rs -= bs;
- else
+ if (INT_SUBTRACT_WRAPV (rs, bs, &rs))
{
- if (rs < 0)
+ if (0 < bs)
{
low_overflow:
- rs = tmin;
+ rs = TYPE_MINIMUM (time_t);
rns = 0;
}
else
{
- rs = tmax;
+ rs = TYPE_MAXIMUM (time_t);
rns = TIMESPEC_HZ - 1;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 2b1dc8c: Update from Gnulib,
Paul Eggert <=