upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

in zone_settimer(), it seems cleaner to check whether

Browse source 
the variable 'next' is set to the epoch (which is used as a sentinel value
meaning 'not set') before comparing it to another time value rather than
after, since the other comparison is meaningless when 'next' is the epoch
This commit is contained in:
Andreas Gustafsson 2001-08-31 19:25:51 +00:00
parent 4b87939256
commit 130904d648
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/dns/zone.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone.c,v 1.336 2001/08/31 02:01:56 marka Exp $ */
/* $Id: zone.c,v 1.337 2001/08/31 19:25:51 gson Exp $ */
#include <config.h>
@ -3813,8 +3813,8 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) {
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) &&
!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) {
INSIST(!isc_time_isepoch(&zone->dumptime));
if (isc_time_compare(&zone->dumptime, &next) < 0 ||
isc_time_isepoch(&next))
if (isc_time_isepoch(&next) ||
isc_time_compare(&zone->dumptime, &next) < 0)
next = zone->dumptime;
}
break;
@ -3830,14 +3830,14 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) {
!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOREFRESH) &&
!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADING)) {
INSIST(!isc_time_isepoch(&zone->refreshtime));
if (isc_time_compare(&zone->refreshtime, &next) < 0 ||
isc_time_isepoch(&next))
if (isc_time_isepoch(&next) ||
isc_time_compare(&zone->refreshtime, &next) < 0)
next = zone->refreshtime;
}
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) {
INSIST(!isc_time_isepoch(&zone->expiretime));
if (isc_time_compare(&zone->expiretime, &next) < 0 ||
isc_time_isepoch(&next))
if (isc_time_isepoch(&next) ||
isc_time_compare(&zone->expiretime, &next) < 0)
next = zone->expiretime;
}
break;