1
0
mirror of https://frontier.innolan.net/rainlance/amiga-tz.git synced 2025-12-07 16:55:13 +00:00

code shuffling

SCCS-file: zic.c
SCCS-SID: 7.14
This commit is contained in:
Arthur David Olson
1993-10-31 15:57:25 -05:00
committed by Paul Eggert
parent b5a3d4357d
commit 5e23596e17

14
zic.c
View File

@ -1407,11 +1407,11 @@ const int zonecount;
** assuming the current gmtoff and
** stdoff values.
*/
offset = gmtoff;
if (!zp->z_untilrule.r_todisstd)
offset = oadd(offset, stdoff);
untiltime = tadd(zp->z_untiltime,
-offset);
-gmtoff);
if (!zp->z_untilrule.r_todisstd)
untiltime = tadd(untiltime,
-stdoff);
}
/*
** Find the rule (of those to do, if any)
@ -1470,9 +1470,7 @@ addtt(starttime, addtype(startoff, startbuf, startisdst, startttisstd));
offset = oadd(zp->z_gmtoff, rp->r_stdoff);
type = addtype(offset, buf, rp->r_stdoff != 0,
rp->r_todisstd);
if (timecnt != 0 || rp->r_stdoff != 0 ||
typecnt > 1)
addtt(ktime, type);
addtt(ktime, type);
stdoff = rp->r_stdoff;
}
}
@ -1496,6 +1494,8 @@ const int type;
{
if (timecnt != 0 && type == types[timecnt - 1])
return; /* easy enough! */
if (timecnt == 0 && type == 0 && isdsts[0] == 0)
return; /* handled by default rule */
if (timecnt >= TZ_MAX_TIMES) {
error("too many transitions?!");
(void) exit(EXIT_FAILURE);