From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 8 Jun 2016 18:55:06 +0000 (+0200)
Subject: [4308] Changes after review
X-Git-Tag: trac4272a_base~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2bb6061189b76f1db7275bba3b7c26f5be91687;p=thirdparty%2Fkea.git

[4308] Changes after review

 - .arg() calls now in separate lines
 - clarified comment about clients meeting client class criteria
---

diff --git a/src/lib/dhcpsrv/cfg_subnets4.cc b/src/lib/dhcpsrv/cfg_subnets4.cc
index 3a5a297787..86ea452868 100644
--- a/src/lib/dhcpsrv/cfg_subnets4.cc
+++ b/src/lib/dhcpsrv/cfg_subnets4.cc
@@ -100,7 +100,7 @@ CfgSubnets4::selectSubnet(const SubnetSelector& selector) const {
                 continue;
             }
 
-            // Eliminate those subnets that do not meet client class criteria.
+            // If a subnet meets the client class criteria return it.
             if ((*subnet)->clientSupported(selector.client_classes_)) {
                 return (*subnet);
             }
@@ -182,11 +182,12 @@ CfgSubnets4::selectSubnet(const std::string& iface,
             continue;
         }
 
-        // Eliminate those subnets that do not meet client class criteria.
+        // If a subnet meets the client class criteria return it.
         if ((*subnet)->clientSupported(client_classes)) {
             LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE,
                       DHCPSRV_CFGMGR_SUBNET4_IFACE)
-                .arg((*subnet)->toText()).arg(iface);
+                .arg((*subnet)->toText())
+                .arg(iface);
             return (*subnet);
         }
     }
@@ -206,10 +207,11 @@ CfgSubnets4::selectSubnet(const IOAddress& address,
             continue;
         }
 
-        // Eliminate those subnets that do not meet client class criteria.
+        // If a subnet meets the client class criteria return it.
         if ((*subnet)->clientSupported(client_classes)) {
             LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, DHCPSRV_CFGMGR_SUBNET4_ADDR)
-                .arg((*subnet)->toText()).arg(address.toText());
+                .arg((*subnet)->toText())
+                .arg(address.toText());
             return (*subnet);
         }
     }