From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 24 Jan 2018 00:10:04 +0000 (+0100)
Subject: [github36] Couple line wraps fixed.
X-Git-Tag: trac5502_base~5^2~7^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f3a6936c5f870c807a735d91c6bbe0c416a2006;p=thirdparty%2Fkea.git

[github36] Couple line wraps fixed.
---

diff --git a/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.cc b/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.cc
index 6d125fe871..4a583309c2 100644
--- a/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/generic_host_data_source_benchmark.cc
@@ -37,7 +37,8 @@ namespace isc {
 namespace dhcp {
 namespace bench {
 
-GenericHostDataSourceBenchmark::GenericHostDataSourceBenchmark() : hdsptr_() {
+GenericHostDataSourceBenchmark::GenericHostDataSourceBenchmark()
+    : hdsptr_() {
     LibDHCP::clearRuntimeOptionDefs();
 }
 
@@ -48,7 +49,7 @@ GenericHostDataSourceBenchmark::~GenericHostDataSourceBenchmark() {
 
 void
 GenericHostDataSourceBenchmark::ReentrantSetUp(::benchmark::State& state,
-                                              size_t const& host_count) {
+                                               size_t const& host_count) {
     state.PauseTiming();
     SetUp(state);
     prepareHosts(host_count);
@@ -56,8 +57,8 @@ GenericHostDataSourceBenchmark::ReentrantSetUp(::benchmark::State& state,
 }
 
 void
-GenericHostDataSourceBenchmark::ReentrantSetUpWithInserts(
-    ::benchmark::State& state, size_t const& host_count) {
+GenericHostDataSourceBenchmark::ReentrantSetUpWithInserts(::benchmark::State& state,
+                                                          size_t const& host_count) {
     state.PauseTiming();
     SetUp(state);
     prepareHosts(host_count);
@@ -104,8 +105,8 @@ GenericHostDataSourceBenchmark::generateIdentifier(const bool new_identifier) {
 }
 
 HostPtr
-GenericHostDataSourceBenchmark::initializeHost4(
-    const std::string& address, const Host::IdentifierType& id) {
+GenericHostDataSourceBenchmark::initializeHost4(const std::string& address,
+                                                const Host::IdentifierType& id) {
     std::vector<uint8_t> ident;
     if (id == Host::IDENT_HWADDR) {
         ident = generateHWAddr();
@@ -130,8 +131,7 @@ GenericHostDataSourceBenchmark::initializeHost4(
 HostPtr
 GenericHostDataSourceBenchmark::initializeHost6(std::string address,
                                                 Host::IdentifierType identifier,
-                                                bool prefix,
-                                                bool new_identifier) {
+                                                bool prefix, bool new_identifier) {
     std::vector<uint8_t> ident;
     switch (identifier) {
     case Host::IDENT_HWADDR:
@@ -168,21 +168,19 @@ GenericHostDataSourceBenchmark::initializeHost6(std::string address,
 }
 
 OptionDescriptor
-GenericHostDataSourceBenchmark::createEmptyOption(
-    const Option::Universe& universe,
-    const uint16_t option_type,
-    const bool persist) const {
+GenericHostDataSourceBenchmark::createEmptyOption(const Option::Universe& universe,
+                                                  const uint16_t option_type,
+                                                  const bool persist) const {
     OptionPtr option(new Option(universe, option_type));
     OptionDescriptor desc(option, persist);
     return desc;
 }
 
 OptionDescriptor
-GenericHostDataSourceBenchmark::createVendorOption(
-    const Option::Universe& universe,
-    const bool persist,
-    const bool formatted,
-    const uint32_t vendor_id) const {
+GenericHostDataSourceBenchmark::createVendorOption(const Option::Universe& universe,
+                                                   const bool persist,
+                                                   const bool formatted,
+                                                   const uint32_t vendor_id) const {
     OptionVendorPtr option(new OptionVendor(universe, vendor_id));
 
     std::ostringstream s;
@@ -197,10 +195,8 @@ GenericHostDataSourceBenchmark::createVendorOption(
 }
 
 void
-GenericHostDataSourceBenchmark::addTestOptions(
-    const HostPtr& host,
-    const bool formatted,
-    const AddedOptions& added_options) const {
+GenericHostDataSourceBenchmark::addTestOptions(const HostPtr& host, const bool formatted,
+                                               const AddedOptions& added_options) const {
     OptionDefSpaceContainer defs;
 
     if ((added_options == DHCP4_ONLY) || (added_options == DHCP4_AND_DHCP6)) {
diff --git a/src/lib/dhcpsrv/benchmarks/memfile_lease_mgr_benchmark.cc b/src/lib/dhcpsrv/benchmarks/memfile_lease_mgr_benchmark.cc
index 44ad53c38c..ac3f78e6f5 100644
--- a/src/lib/dhcpsrv/benchmarks/memfile_lease_mgr_benchmark.cc
+++ b/src/lib/dhcpsrv/benchmarks/memfile_lease_mgr_benchmark.cc
@@ -79,8 +79,7 @@ public:
     /// @return Configuration string for @c LeaseMgrFactory.
     static std::string getConfigString(Universe u) {
         std::ostringstream s;
-        s << "type=memfile " << (u == V4 ? "universe=4 " : "universe=6 ")
-          << "name="
+        s << "type=memfile " << (u == V4 ? "universe=4 " : "universe=6 ") << "name="
           << getLeaseFilePath(u == V4 ? "leasefile4_0.csv" : "leasefile6_0.csv")
           << " lfc-interval=0";
         return (s.str());
@@ -108,10 +107,8 @@ public:
         // resulting file names are the ones that may exist as a
         // result of LFC.
         for (int i = static_cast<int>(Memfile_LeaseMgr::FILE_CURRENT);
-             i <= static_cast<int>(Memfile_LeaseMgr::FILE_FINISH);
-             ++i) {
-            Memfile_LeaseMgr::LFCFileType type = static_cast<
-                Memfile_LeaseMgr::LFCFileType>(i);
+             i <= static_cast<int>(Memfile_LeaseMgr::FILE_FINISH); ++i) {
+            Memfile_LeaseMgr::LFCFileType type = static_cast<Memfile_LeaseMgr::LFCFileType>(i);
             LeaseFileIO io(Memfile_LeaseMgr::appendSuffix(base_name, type));
             io.removeFile();
         }