[#3536] wrap long lines

diff --git a/src/hooks/dhcp/mysql_hb/mysql_hb_callouts.cc b/src/hooks/dhcp/mysql_hb/mysql_hb_callouts.cc
index 72394b19dfffb88a36e4ba895a37f2b68d897326..56a4fcac7fabf7088d28bb692d492fe3a4c07cc9 100644 (file)
--- a/src/hooks/dhcp/mysql_hb/mysql_hb_callouts.cc
+++ b/src/hooks/dhcp/mysql_hb/mysql_hb_callouts.cc
@@ -52,7 +52,9 @@ int load(LibraryHandle& /* handle */) {
     }
 
     // Register MySQL HB factories with Host Managers
-    HostDataSourceFactory::registerFactory("mysql", MySqlHostDataSource::factory, true,
+    HostDataSourceFactory::registerFactory("mysql",
+                                           MySqlHostDataSource::factory,
+                                           true,
                                            MySqlHostDataSource::getDBVersion);
 
     LOG_INFO(mysql_hb_logger, MYSQL_HB_INIT_OK);

diff --git a/src/hooks/dhcp/mysql_hb/mysql_hb_messages.cc b/src/hooks/dhcp/mysql_hb/mysql_hb_messages.cc
index 6acee77a179fe4cf7d92cd10c46aadcd9d18b616..196222c1c92f3755a82bb73446e0208376d05a8e 100644 (file)
--- a/src/hooks/dhcp/mysql_hb/mysql_hb_messages.cc
+++ b/src/hooks/dhcp/mysql_hb/mysql_hb_messages.cc
@@ -4,10 +4,16 @@
 #include <log/message_types.h>
 #include <log/message_initializer.h>
 
+namespace isc {
+namespace dhcp {
+
 extern const isc::log::MessageID MYSQL_HB_DB = "MYSQL_HB_DB";
 extern const isc::log::MessageID MYSQL_HB_DEINIT_OK = "MYSQL_HB_DEINIT_OK";
 extern const isc::log::MessageID MYSQL_HB_INIT_OK = "MYSQL_HB_INIT_OK";
 
+} // namespace dhcp
+} // namespace isc
+
 namespace {
 
 const char* values[] = {

diff --git a/src/hooks/dhcp/mysql_hb/mysql_hb_messages.h b/src/hooks/dhcp/mysql_hb/mysql_hb_messages.h
index 2b3d97823e621f03ea3f806b0e0e9d10358f25f7..ffe420bca2bcc179ab5b70c15074432ee4349d71 100644 (file)
--- a/src/hooks/dhcp/mysql_hb/mysql_hb_messages.h
+++ b/src/hooks/dhcp/mysql_hb/mysql_hb_messages.h
@@ -5,8 +5,14 @@
 
 #include <log/message_types.h>
 
+namespace isc {
+namespace dhcp {
+
 extern const isc::log::MessageID MYSQL_HB_DB;
 extern const isc::log::MessageID MYSQL_HB_DEINIT_OK;
 extern const isc::log::MessageID MYSQL_HB_INIT_OK;
 
+} // namespace dhcp
+} // namespace isc
+
 #endif // MYSQL_HB_MESSAGES_H

diff --git a/src/hooks/dhcp/mysql_hb/mysql_host_data_source.h b/src/hooks/dhcp/mysql_hb/mysql_host_data_source.h
index f32ed52d8414ffeea1d2993a3b4700bb717974ec..1cc2e1c354499b3ebe8fab52fc9e35bef7458461 100644 (file)
--- a/src/hooks/dhcp/mysql_hb/mysql_host_data_source.h
+++ b/src/hooks/dhcp/mysql_hb/mysql_host_data_source.h
@@ -549,7 +549,9 @@ public:
 struct MySqlHostDataSourceInit {
     // Constructor registers
     MySqlHostDataSourceInit() {
-        HostDataSourceFactory::registerFactory("mysql", MySqlHostDataSource::factory, true,
+        HostDataSourceFactory::registerFactory("mysql",
+                                               MySqlHostDataSource::factory,
+                                               true,
                                                MySqlHostDataSource::getDBVersion);
     }
 

diff --git a/src/hooks/dhcp/mysql_lb/mysql_lb_callouts.cc b/src/hooks/dhcp/mysql_lb/mysql_lb_callouts.cc
index 97808d02066b919777c95f9103b019779d95f840..fe557edc9f5690b89e0d923ad9eb6aae8e313e30 100644 (file)
--- a/src/hooks/dhcp/mysql_lb/mysql_lb_callouts.cc
+++ b/src/hooks/dhcp/mysql_lb/mysql_lb_callouts.cc
@@ -52,7 +52,9 @@ int load(LibraryHandle& /* handle */) {
     }
 
     // Register MySQL LB factories with Lease Managers
-    LeaseMgrFactory::registerFactory("mysql", MySqlLeaseMgr::factory, true,
+    LeaseMgrFactory::registerFactory("mysql",
+                                     MySqlLeaseMgr::factory,
+                                     true,
                                      MySqlLeaseMgr::getDBVersion);
 
     LOG_INFO(mysql_lb_logger, MYSQL_LB_INIT_OK);

diff --git a/src/hooks/dhcp/mysql_lb/mysql_lb_messages.cc b/src/hooks/dhcp/mysql_lb/mysql_lb_messages.cc
index 81d6f1ee69e1ae96904d60d74572f49f1fb6d288..9551966c672b715000d1f15ecba3b5108752ec50 100644 (file)
--- a/src/hooks/dhcp/mysql_lb/mysql_lb_messages.cc
+++ b/src/hooks/dhcp/mysql_lb/mysql_lb_messages.cc
@@ -4,10 +4,16 @@
 #include <log/message_types.h>
 #include <log/message_initializer.h>
 
+namespace isc {
+namespace dhcp {
+
 extern const isc::log::MessageID MYSQL_LB_DB = "MYSQL_LB_DB";
 extern const isc::log::MessageID MYSQL_LB_DEINIT_OK = "MYSQL_LB_DEINIT_OK";
 extern const isc::log::MessageID MYSQL_LB_INIT_OK = "MYSQL_LB_INIT_OK";
 
+} // namespace dhcp
+} // namespace isc
+
 namespace {
 
 const char* values[] = {

diff --git a/src/hooks/dhcp/mysql_lb/mysql_lb_messages.h b/src/hooks/dhcp/mysql_lb/mysql_lb_messages.h
index 6de57446b14dcf541ea2b7a3381637efc90eccec..b58d2265314f6e5a07b52aaabc4558d610a007d4 100644 (file)
--- a/src/hooks/dhcp/mysql_lb/mysql_lb_messages.h
+++ b/src/hooks/dhcp/mysql_lb/mysql_lb_messages.h
@@ -5,8 +5,14 @@
 
 #include <log/message_types.h>
 
+namespace isc {
+namespace dhcp {
+
 extern const isc::log::MessageID MYSQL_LB_DB;
 extern const isc::log::MessageID MYSQL_LB_DEINIT_OK;
 extern const isc::log::MessageID MYSQL_LB_INIT_OK;
 
+} // namespace dhcp
+} // namespace isc
+
 #endif // MYSQL_LB_MESSAGES_H

diff --git a/src/hooks/dhcp/mysql_lb/mysql_lease_mgr.h b/src/hooks/dhcp/mysql_lb/mysql_lease_mgr.h
index 29791f188a7c0352e5cccd18e01f6ab0c62b4e0a..19f401d457b19e035b3901e3517c3c52513c6e72 100644 (file)
--- a/src/hooks/dhcp/mysql_lb/mysql_lease_mgr.h
+++ b/src/hooks/dhcp/mysql_lb/mysql_lease_mgr.h
@@ -1313,7 +1313,9 @@ public:
 struct MySqlLeaseMgrInit {
     // Constructor registers
     MySqlLeaseMgrInit() {
-        LeaseMgrFactory::registerFactory("mysql", MySqlLeaseMgr::factory, true,
+        LeaseMgrFactory::registerFactory("mysql",
+                                         MySqlLeaseMgr::factory,
+                                         true,
                                          MySqlLeaseMgr::getDBVersion);
     }
 

diff --git a/src/hooks/dhcp/pgsql_hb/pgsql_hb_callouts.cc b/src/hooks/dhcp/pgsql_hb/pgsql_hb_callouts.cc
index 8aa31e7b0a3ff3ff8c296d7c03044cfc80836454..ce82230df7e3c6940dfec470ffb2fa0af45c79ea 100644 (file)
--- a/src/hooks/dhcp/pgsql_hb/pgsql_hb_callouts.cc
+++ b/src/hooks/dhcp/pgsql_hb/pgsql_hb_callouts.cc
@@ -52,7 +52,9 @@ int load(LibraryHandle& /* handle */) {
     }
 
     // Register PgSQL HB factories with Host Managers
-    HostDataSourceFactory::registerFactory("postgresql", PgSqlHostDataSource::factory, true,
+    HostDataSourceFactory::registerFactory("postgresql",
+                                           PgSqlHostDataSource::factory,
+                                           true,
                                            PgSqlHostDataSource::getDBVersion);
 
     LOG_INFO(pgsql_hb_logger, PGSQL_HB_INIT_OK);

diff --git a/src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.cc b/src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.cc
index 63ca0009a3f9e2d536aeaa4034ce01e420826ac4..ef2a0c8d7e70b3015294015937c546fb1e960b6a 100644 (file)
--- a/src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.cc
+++ b/src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.cc
@@ -4,10 +4,16 @@
 #include <log/message_types.h>
 #include <log/message_initializer.h>
 
+namespace isc {
+namespace dhcp {
+
 extern const isc::log::MessageID PGSQL_HB_DB = "PGSQL_HB_DB";
 extern const isc::log::MessageID PGSQL_HB_DEINIT_OK = "PGSQL_HB_DEINIT_OK";
 extern const isc::log::MessageID PGSQL_HB_INIT_OK = "PGSQL_HB_INIT_OK";
 
+} // namespace dhcp
+} // namespace isc
+
 namespace {
 
 const char* values[] = {

diff --git a/src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.h b/src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.h
index f001c189cdb877f239912e688f540c30d73370f1..6fe9af73cdf9133b8087358e56b47ba36216f51b 100644 (file)
--- a/src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.h
+++ b/src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.h
@@ -5,8 +5,14 @@
 
 #include <log/message_types.h>
 
+namespace isc {
+namespace dhcp {
+
 extern const isc::log::MessageID PGSQL_HB_DB;
 extern const isc::log::MessageID PGSQL_HB_DEINIT_OK;
 extern const isc::log::MessageID PGSQL_HB_INIT_OK;
 
+} // namespace dhcp
+} // namespace isc
+
 #endif // PGSQL_HB_MESSAGES_H

diff --git a/src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h b/src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h
index 5ce41bf31f9f77cd4333bac3189ab74c98fb2f2e..b207715f56e57cd1512adfacdd99a091f91a2b6f 100644 (file)
--- a/src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h
+++ b/src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h
@@ -601,7 +601,9 @@ public:
 struct PgSqlHostDataSourceInit {
     // Constructor registers
     PgSqlHostDataSourceInit() {
-        HostDataSourceFactory::registerFactory("postgresql", PgSqlHostDataSource::factory, true,
+        HostDataSourceFactory::registerFactory("postgresql",
+                                               PgSqlHostDataSource::factory,
+                                               true,
                                                PgSqlHostDataSource::getDBVersion);
     }
 

diff --git a/src/hooks/dhcp/pgsql_lb/pgsql_lb_callouts.cc b/src/hooks/dhcp/pgsql_lb/pgsql_lb_callouts.cc
index 7d299e698ef27d6874f78924778d559317e281ce..85e507ed3f0a96457851e762db3b12afe21c5f3a 100644 (file)
--- a/src/hooks/dhcp/pgsql_lb/pgsql_lb_callouts.cc
+++ b/src/hooks/dhcp/pgsql_lb/pgsql_lb_callouts.cc
@@ -52,7 +52,9 @@ int load(LibraryHandle& /* handle */) {
     }
 
     // Register PgSQL LB factories with Lease Managers
-    LeaseMgrFactory::registerFactory("postgresql", PgSqlLeaseMgr::factory, true,
+    LeaseMgrFactory::registerFactory("postgresql",
+                                     PgSqlLeaseMgr::factory,
+                                     true,
                                      PgSqlLeaseMgr::getDBVersion);
 
     LOG_INFO(pgsql_lb_logger, PGSQL_LB_INIT_OK);

diff --git a/src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.cc b/src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.cc
index de5b41fb76bae211f8ed0e41062571bd460f9dc8..7fb161f8f27c3f90a7743957f6347536ead7431a 100644 (file)
--- a/src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.cc
+++ b/src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.cc
@@ -4,10 +4,16 @@
 #include <log/message_types.h>
 #include <log/message_initializer.h>
 
+namespace isc {
+namespace dhcp {
+
 extern const isc::log::MessageID PGSQL_LB_DB = "PGSQL_LB_DB";
 extern const isc::log::MessageID PGSQL_LB_DEINIT_OK = "PGSQL_LB_DEINIT_OK";
 extern const isc::log::MessageID PGSQL_LB_INIT_OK = "PGSQL_LB_INIT_OK";
 
+} // namespace dhcp
+} // namespace isc
+
 namespace {
 
 const char* values[] = {

diff --git a/src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.h b/src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.h
index 570da650545f3dd6a4fda4a8e3df418348a67b10..0cb8977dd7b7a1ba48ab9371560a51216d224025 100644 (file)
--- a/src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.h
+++ b/src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.h
@@ -5,8 +5,14 @@
 
 #include <log/message_types.h>
 
+namespace isc {
+namespace dhcp {
+
 extern const isc::log::MessageID PGSQL_LB_DB;
 extern const isc::log::MessageID PGSQL_LB_DEINIT_OK;
 extern const isc::log::MessageID PGSQL_LB_INIT_OK;
 
+} // namespace dhcp
+} // namespace isc
+
 #endif // PGSQL_LB_MESSAGES_H

diff --git a/src/hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h b/src/hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h
index 1004c45a153b00b3a2ea72b6cebaf2e7e9b3663a..f6dc85febd0bd4a9f9b46466e87416c0ffe6273d 100644 (file)
--- a/src/hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h
+++ b/src/hooks/dhcp/pgsql_lb/pgsql_lease_mgr.h
@@ -1272,7 +1272,9 @@ public:
 struct PgSqlLeaseMgrInit {
     // Constructor registers
     PgSqlLeaseMgrInit() {
-        LeaseMgrFactory::registerFactory("postgresql", PgSqlLeaseMgr::factory, true,
+        LeaseMgrFactory::registerFactory("postgresql",
+                                         PgSqlLeaseMgr::factory,
+                                         true,
                                          PgSqlLeaseMgr::getDBVersion);
     }
 

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h
index c283e6296ca3bffc91de2c8f3ae7276aa765407f..e1a3d733ae98e462a959d7961e93a346a981fd85 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.h
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.h
@@ -1579,7 +1579,9 @@ public:
 struct MemfileLeaseMgrInit {
     // Constructor registers
     MemfileLeaseMgrInit() {
-        LeaseMgrFactory::registerFactory("memfile", Memfile_LeaseMgr::factory, true,
+        LeaseMgrFactory::registerFactory("memfile",
+                                         Memfile_LeaseMgr::factory,
+                                         true,
                                          Memfile_LeaseMgr::getDBVersion);
     }