From 193f39502937ea7e19a98a8b4e5979ad67f73eb1 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Fri, 19 Dec 2025 14:51:03 -0500 Subject: [PATCH] [#4176] Address compiler warnings modified: src/hooks/dhcp/lease_cmds/lease_cmds.cc modified: src/lib/dhcpsrv/lease.cc modified: src/lib/dhcpsrv/lease_mgr.cc --- src/hooks/dhcp/lease_cmds/lease_cmds.cc | 3 +-- src/lib/dhcpsrv/lease.cc | 6 ++++++ src/lib/dhcpsrv/lease_mgr.cc | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc index b89c037d77..e6ce85f372 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc +++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc @@ -1345,8 +1345,7 @@ LeaseCmdsImpl::leaseGetByStateHandler(CalloutHandle& handle) { s << leases_json->size() << " IPv" << (v4 ? "4" : "6") << " lease(s) found with state "; - if ((state_ >= Lease::STATE_DEFAULT) && - (state_ <= Lease::STATE_REGISTERED)) { + if (state_ <= Lease::STATE_REGISTERED) { s << Lease::basicStatesToText(state_) << " (" << state_ << ")"; } else { s << state_; diff --git a/src/lib/dhcpsrv/lease.cc b/src/lib/dhcpsrv/lease.cc index d20ba3e3ac..1dccb5cec1 100644 --- a/src/lib/dhcpsrv/lease.cc +++ b/src/lib/dhcpsrv/lease.cc @@ -24,6 +24,12 @@ using namespace std; namespace isc { namespace dhcp { +constexpr uint32_t Lease::STATE_DEFAULT; +constexpr uint32_t Lease::STATE_DECLINED; +constexpr uint32_t Lease::STATE_EXPIRED_RECLAIMED; +constexpr uint32_t Lease::STATE_RELEASED; +constexpr uint32_t Lease::STATE_REGISTERED; + std::string Lease::lifetimeToText(uint32_t lifetime) { ostringstream repr; diff --git a/src/lib/dhcpsrv/lease_mgr.cc b/src/lib/dhcpsrv/lease_mgr.cc index caf7ffcb07..3b93c1cab8 100644 --- a/src/lib/dhcpsrv/lease_mgr.cc +++ b/src/lib/dhcpsrv/lease_mgr.cc @@ -1467,10 +1467,12 @@ constexpr uint16_t RECLAIMED_ASSIGNED = STATE_MASK(Lease::STATE_EXPIRED_RECLAIME Lease::STATE_DEFAULT); constexpr uint16_t RECLAIMED_DECLINED = STATE_MASK(Lease::STATE_EXPIRED_RECLAIMED, Lease::STATE_DECLINED); +#if 0 // Currently unused. constexpr uint16_t RECLAIMED_RECLAIMED = STATE_MASK(Lease::STATE_EXPIRED_RECLAIMED, Lease::STATE_EXPIRED_RECLAIMED); constexpr uint16_t RECLAIMED_RELEASED = STATE_MASK(Lease::STATE_EXPIRED_RECLAIMED, Lease::STATE_RELEASED); +#endif constexpr uint16_t RECLAIMED_REGISTERED = STATE_MASK(Lease::STATE_EXPIRED_RECLAIMED, Lease::STATE_REGISTERED); // New state RELEASED @@ -1478,10 +1480,12 @@ constexpr uint16_t RELEASED_ASSIGNED = STATE_MASK(Lease::STATE_RELEASED, Lease::STATE_DEFAULT); constexpr uint16_t RELEASED_DECLINED = STATE_MASK(Lease::STATE_RELEASED, Lease::STATE_DECLINED); +#if 0 // Currently unused. constexpr uint16_t RELEASED_RECLAIMED = STATE_MASK(Lease::STATE_RELEASED, Lease::STATE_EXPIRED_RECLAIMED); constexpr uint16_t RELEASED_RELEASED = STATE_MASK(Lease::STATE_RELEASED, Lease::STATE_RELEASED); +#endif constexpr uint16_t RELEASED_REGISTERED = STATE_MASK(Lease::STATE_RELEASED, Lease::STATE_REGISTERED); // New state REGISTERED -- 2.47.3