From 869707274bbea6111ca41253e6a6fbf0ca9cb31f Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sat, 17 Mar 2018 09:19:56 +0100 Subject: [PATCH] [5533a] Restored line wraps for 80 column terminal --- premium | 2 +- src/lib/dhcpsrv/host_mgr.cc | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/premium b/premium index a7fc174b6a..d84f26f3ce 160000 --- a/premium +++ b/premium @@ -1 +1 @@ -Subproject commit a7fc174b6a6dc556fbbea79dc267f458bd7e3a79 +Subproject commit d84f26f3cecd0d8581027dc1c4de19c7d6cd6154 diff --git a/src/lib/dhcpsrv/host_mgr.cc b/src/lib/dhcpsrv/host_mgr.cc index f53cf1b390..60d78c3e75 100644 --- a/src/lib/dhcpsrv/host_mgr.cc +++ b/src/lib/dhcpsrv/host_mgr.cc @@ -138,7 +138,8 @@ HostMgr::get4(const SubnetID& subnet_id, const HWAddrPtr& hwaddr, if (host || alternate_sources_.empty()) { return (host); } - LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_HWADDR_DUID) + LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, + HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_HWADDR_DUID) .arg(subnet_id) .arg(hwaddr ? hwaddr->toText() : "(no-hwaddr)") .arg(duid ? duid->toText() : "(duid)"); @@ -176,7 +177,8 @@ HostMgr::get4Any(const SubnetID& subnet_id, return (host); } - LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER) + LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, + HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER) .arg(subnet_id) .arg(Host::getIdentifierAsText(identifier_type, identifier_begin, identifier_len)); @@ -203,7 +205,8 @@ HostMgr::get4Any(const SubnetID& subnet_id, return (host); } } - LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS, HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER_NULL) + LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS, + HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER_NULL) .arg(subnet_id) .arg(Host::getIdentifierAsText(identifier_type, identifier_begin, identifier_len)); @@ -233,7 +236,8 @@ HostMgr::get4(const SubnetID& subnet_id, if (host || alternate_sources_.empty()) { return (host); } - LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_ADDRESS4) + LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, + HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_ADDRESS4) .arg(subnet_id) .arg(address.toText()); for (auto source : alternate_sources_) { @@ -259,7 +263,8 @@ HostMgr::get6(const SubnetID& subnet_id, const DuidPtr& duid, if (host || alternate_sources_.empty()) { return (host); } - LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_DUID_HWADDR) + LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, + HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_DUID_HWADDR) .arg(subnet_id) .arg(duid ? duid->toText() : "(duid)") .arg(hwaddr ? hwaddr->toText() : "(no-hwaddr)"); @@ -319,7 +324,8 @@ HostMgr::get6Any(const SubnetID& subnet_id, return (host); } - LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER) + LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, + HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER) .arg(subnet_id) .arg(Host::getIdentifierAsText(identifier_type, identifier_begin, identifier_len)); @@ -377,7 +383,8 @@ HostMgr::get6(const SubnetID& subnet_id, if (host || alternate_sources_.empty()) { return (host); } - LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_ADDRESS6) + LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, + HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_ADDRESS6) .arg(subnet_id) .arg(addr.toText()); for (auto source : alternate_sources_) { -- 2.47.3