procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update from Gnulib

Browse source 
This incorporates:
2019-10-24 timespec-add, timespec-sub: simplify
* lib/timespec-add.c, lib/timespec-sub.c:
Copy from Gnulib.
This commit is contained in:
Paul Eggert 2019-11-05 22:59:00 -08:00
parent 6039acb861
commit 2b1dc8c26e
2 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/timespec-add.c
View file

@ -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;
}
}

20
lib/timespec-sub.c
View file

@ -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;
}
}