Commit fb96420b1f for bind
commit fb96420b1ff155c8550f12baaa21d67bf4edf55d
Author: Matthijs Mekking <matthijs@isc.org>
Date: Thu Oct 29 15:48:38 2026 +0100
Use a single instruction for dns_notifyctx_hasflag
Replace some dns_notifyctx_hasflag() calls by a single one.
diff --git a/lib/dns/notify.c b/lib/dns/notify.c
index a29cadff98..8b10870472 100644
--- a/lib/dns/notify.c
+++ b/lib/dns/notify.c
@@ -842,8 +842,8 @@ dns_notifyctx_defer(dns_notifyctx_t *nctx, isc_time_t now) {
REQUIRE(nctx != NULL);
if (nctx->notifydefer != 0 &&
- !dns_notifyctx_hasflag(nctx, DNS_NOTIFY_NODEFER) &&
- !dns_notifyctx_hasflag(nctx, DNS_NOTIFY_DEFERRED))
+ !dns_notifyctx_hasflag(nctx,
+ DNS_NOTIFY_NODEFER | DNS_NOTIFY_DEFERRED))
{
if (isc_time_compare(&now, &nctx->notifytime) > 0) {
nctx->notifytime = now;
@@ -858,7 +858,7 @@ bool
dns_notifyctx_notify_needed(dns_notifyctx_t *nctx, isc_time_t now) {
REQUIRE(nctx != NULL);
- return (dns_notifyctx_hasflag(nctx, DNS_NOTIFY_NEEDSEND) ||
- dns_notifyctx_hasflag(nctx, DNS_NOTIFY_NEEDSTARTUP)) &&
+ return dns_notifyctx_hasflag(nctx, DNS_NOTIFY_NEEDSEND |
+ DNS_NOTIFY_NEEDSTARTUP) &&
isc_time_compare(&now, &nctx->notifytime) >= 0;
}
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index d23464033c..440d780998 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -13276,8 +13276,8 @@ zone_shutdown(void *arg) {
static bool
notify_needed(dns_notifyctx_t *nctx) {
- return dns_notifyctx_hasflag(nctx, DNS_NOTIFY_NEEDSEND) ||
- dns_notifyctx_hasflag(nctx, DNS_NOTIFY_NEEDSTARTUP);
+ return dns_notifyctx_hasflag(nctx, DNS_NOTIFY_NEEDSEND |
+ DNS_NOTIFY_NEEDSTARTUP);
}
static void