From: Razvan Becheriu Date: Mon, 19 Feb 2018 18:37:15 +0000 (+0200) Subject: fixed unit tests X-Git-Tag: kea5574_base~10^2~1^2~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ea59aee101bdb0041eba734501747d555a44429;p=thirdparty%2Fkea.git fixed unit tests --- diff --git a/src/lib/dhcpsrv/cql_lease_mgr.cc b/src/lib/dhcpsrv/cql_lease_mgr.cc index 46b77134b8..ac2bd79f7e 100644 --- a/src/lib/dhcpsrv/cql_lease_mgr.cc +++ b/src/lib/dhcpsrv/cql_lease_mgr.cc @@ -641,10 +641,7 @@ CqlLease4Exchange::retrieve() { time_t cltt = 0; CqlExchange::convertFromDatabaseTime(expire_, valid_lifetime_, cltt); - HWAddrPtr hwaddr; - if (hwaddr_.size()) { - hwaddr.reset(new HWAddr(hwaddr_, HTYPE_ETHER)); - } + HWAddrPtr hwaddr(new HWAddr(hwaddr_, HTYPE_ETHER)); uint32_t addr4 = static_cast(address_); @@ -1067,8 +1064,7 @@ CqlLease6Exchange::createBindForInsert(const Lease6Ptr &lease, AnyArray &data) { // hwaddr_source: int if (lease_->hwaddr_) { - hwaddr_source_ = - static_cast(lease_->hwaddr_->source_); + hwaddr_source_ = static_cast(lease_->hwaddr_->source_); } else { hwaddr_source_ = 0; } @@ -1201,8 +1197,7 @@ CqlLease6Exchange::createBindForUpdate(const Lease6Ptr &lease, AnyArray &data, // hwaddr_source: int if (lease_->hwaddr_) { - hwaddr_source_ = - static_cast(lease_->hwaddr_->source_); + hwaddr_source_ = static_cast(lease_->hwaddr_->source_); } else { hwaddr_source_ = 0; }