From: Andrei Pavel <andrei@isc.org>
Date: Tue, 22 Dec 2020 13:16:18 +0000 (+0200)
Subject: [#1602] remove duplicate includes
X-Git-Tag: Kea-1.9.4~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e96c6a2a4001646c94ed596af7fdd94244238ef6;p=thirdparty%2Fkea.git

[#1602] remove duplicate includes
---

diff --git a/src/bin/d2/tests/d2_queue_mgr_unittests.cc b/src/bin/d2/tests/d2_queue_mgr_unittests.cc
index 68e9916424..a00de29f4b 100644
--- a/src/bin/d2/tests/d2_queue_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_queue_mgr_unittests.cc
@@ -12,7 +12,6 @@
 #include <dhcp_ddns/ncr_udp.h>
 #include <util/time_utilities.h>
 
-#include <gtest/gtest.h>
 #include <gtest/gtest.h>
 #include <algorithm>
 #include <functional>
diff --git a/src/bin/d2/tests/d2_update_mgr_unittests.cc b/src/bin/d2/tests/d2_update_mgr_unittests.cc
index 8ab2b246e9..c78c4f4dad 100644
--- a/src/bin/d2/tests/d2_update_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_update_mgr_unittests.cc
@@ -11,13 +11,11 @@
 #include <nc_test_utils.h>
 #include <d2/nc_add.h>
 #include <d2/nc_remove.h>
-#include <d2/nc_remove.h>
 #include <d2/simple_add.h>
 #include <d2/simple_remove.h>
 #include <process/testutils/d_test_stubs.h>
 #include <util/time_utilities.h>
 
-#include <gtest/gtest.h>
 #include <gtest/gtest.h>
 #include <algorithm>
 #include <vector>
@@ -680,8 +678,8 @@ TEST_F(D2UpdateMgrTest, addTransaction) {
     ASSERT_TRUE (pos != update_mgr_->transactionListEnd());
     NameChangeTransactionPtr trans = (*pos).second;
     ASSERT_TRUE(trans);
-   
-    // Verify the correct type of transaction was created. 
+
+    // Verify the correct type of transaction was created.
     NameAddTransaction* t = dynamic_cast<NameAddTransaction*>(trans.get());
     ASSERT_TRUE(t);
 
@@ -738,7 +736,7 @@ TEST_F(D2UpdateMgrTest, removeTransaction) {
     NameChangeTransactionPtr trans = (*pos).second;
     ASSERT_TRUE(trans);
 
-    // Verify the correct type of transaction was created. 
+    // Verify the correct type of transaction was created.
     NameRemoveTransaction* t = dynamic_cast<NameRemoveTransaction*>(trans.get());
     ASSERT_TRUE(t);
 
@@ -896,8 +894,8 @@ TEST_F(D2UpdateMgrTest, simpleAddTransaction) {
     ASSERT_TRUE (pos != update_mgr_->transactionListEnd());
     NameChangeTransactionPtr trans = (*pos).second;
     ASSERT_TRUE(trans);
-   
-    // Verify the correct type of transaction was created. 
+
+    // Verify the correct type of transaction was created.
     SimpleAddTransaction* t = dynamic_cast<SimpleAddTransaction*>(trans.get());
     ASSERT_TRUE(t);
 
@@ -955,7 +953,7 @@ TEST_F(D2UpdateMgrTest, simpleRemoveTransaction) {
     NameChangeTransactionPtr trans = (*pos).second;
     ASSERT_TRUE(trans);
 
-    // Verify the correct type of transaction was created. 
+    // Verify the correct type of transaction was created.
     SimpleRemoveTransaction* t = dynamic_cast<SimpleRemoveTransaction*>(trans.get());
     ASSERT_TRUE(t);
 
diff --git a/src/bin/d2/tests/nc_add_unittests.cc b/src/bin/d2/tests/nc_add_unittests.cc
index 67d11d1903..a6a906478a 100644
--- a/src/bin/d2/tests/nc_add_unittests.cc
+++ b/src/bin/d2/tests/nc_add_unittests.cc
@@ -8,7 +8,6 @@
 
 #include <asiolink/io_service.h>
 #include <d2/d2_cfg_mgr.h>
-#include <d2/d2_cfg_mgr.h>
 #include <d2/nc_add.h>
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>
diff --git a/src/bin/d2/tests/nc_remove_unittests.cc b/src/bin/d2/tests/nc_remove_unittests.cc
index e19000460a..4a1ee5c22d 100644
--- a/src/bin/d2/tests/nc_remove_unittests.cc
+++ b/src/bin/d2/tests/nc_remove_unittests.cc
@@ -8,7 +8,6 @@
 
 #include <asiolink/io_service.h>
 #include <d2/d2_cfg_mgr.h>
-#include <d2/d2_cfg_mgr.h>
 #include <d2/nc_remove.h>
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>
diff --git a/src/bin/d2/tests/simple_add_unittests.cc b/src/bin/d2/tests/simple_add_unittests.cc
index a9cda70d8b..2d7a884c4e 100644
--- a/src/bin/d2/tests/simple_add_unittests.cc
+++ b/src/bin/d2/tests/simple_add_unittests.cc
@@ -8,7 +8,6 @@
 
 #include <asiolink/io_service.h>
 #include <d2/d2_cfg_mgr.h>
-#include <d2/d2_cfg_mgr.h>
 #include <d2/simple_add.h>
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>
diff --git a/src/bin/d2/tests/simple_remove_unittests.cc b/src/bin/d2/tests/simple_remove_unittests.cc
index f86e3eaff5..2e4238e553 100644
--- a/src/bin/d2/tests/simple_remove_unittests.cc
+++ b/src/bin/d2/tests/simple_remove_unittests.cc
@@ -8,7 +8,6 @@
 
 #include <asiolink/io_service.h>
 #include <d2/d2_cfg_mgr.h>
-#include <d2/d2_cfg_mgr.h>
 #include <d2/simple_remove.h>
 #include <dns/messagerenderer.h>
 #include <nc_test_utils.h>
diff --git a/src/bin/dhcp4/tests/hooks_unittest.cc b/src/bin/dhcp4/tests/hooks_unittest.cc
index 79c5cae8b8..ed51ae9784 100644
--- a/src/bin/dhcp4/tests/hooks_unittest.cc
+++ b/src/bin/dhcp4/tests/hooks_unittest.cc
@@ -7,7 +7,6 @@
 #include <config.h>
 
 #include <dhcp4/tests/dhcp4_test_utils.h>
-#include <dhcp4/tests/dhcp4_client.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
 #include <dhcp4/json_config_parser.h>
 #include <asiolink/io_service.h>
diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index e3e4121e93..8c7b25c70b 100644
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -43,7 +43,6 @@
 
 #include <fstream>
 #include <iostream>
-#include <fstream>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 192c7aed81..e516279cc0 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -18,7 +18,6 @@
 #include <dhcp/option_string.h>
 #include <dhcp/iface_mgr.h>
 #include <dhcp6/json_config_parser.h>
-#include <dhcp/dhcp6.h>
 #include <dhcp/docsis3_option_defs.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
@@ -30,11 +29,11 @@
 #include <util/range_utilities.h>
 #include <util/encode/hex.h>
 #include <stats/stats_mgr.h>
-
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/tests/dhcp6_client.h>
 #include <dhcp/tests/pkt_captures.h>
 #include <cc/command_interpreter.h>
+
 #include <boost/pointer_cast.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc
index 8fc2cc145a..46ba9b8e9d 100644
--- a/src/bin/dhcp6/tests/get_config_unittest.cc
+++ b/src/bin/dhcp6/tests/get_config_unittest.cc
@@ -11,7 +11,6 @@
 #include <cc/simple_parser.h>
 #include <cc/cfg_to_element.h>
 #include <testutils/user_context_utils.h>
-#include <testutils/user_context_utils.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/parsers/simple_parser6.h>
diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc
index 7f29e135d8..2629fcda68 100644
--- a/src/bin/dhcp6/tests/hooks_unittest.cc
+++ b/src/bin/dhcp6/tests/hooks_unittest.cc
@@ -11,7 +11,6 @@
 #include <dhcp/dhcp6.h>
 #include <dhcp/duid.h>
 #include <dhcp6/json_config_parser.h>
-#include <dhcp/dhcp6.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/lease_mgr.h>
 #include <dhcpsrv/lease_mgr_factory.h>
@@ -20,7 +19,6 @@
 #include <util/range_utilities.h>
 #include <hooks/server_hooks.h>
 #include <hooks/callout_manager.h>
-
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/tests/dhcp6_client.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
diff --git a/src/hooks/dhcp/high_availability/communication_state.cc b/src/hooks/dhcp/high_availability/communication_state.cc
index 76eb2a1331..af9036ea20 100644
--- a/src/hooks/dhcp/high_availability/communication_state.cc
+++ b/src/hooks/dhcp/high_availability/communication_state.cc
@@ -7,7 +7,6 @@
 #include <config.h>
 
 #include <communication_state.h>
-#include <exceptions/exceptions.h>
 #include <ha_log.h>
 #include <ha_service_states.h>
 #include <cc/data.h>
diff --git a/src/hooks/dhcp/high_availability/ha_service.h b/src/hooks/dhcp/high_availability/ha_service.h
index 29eafcab02..6558b98cee 100644
--- a/src/hooks/dhcp/high_availability/ha_service.h
+++ b/src/hooks/dhcp/high_availability/ha_service.h
@@ -15,12 +15,12 @@
 #include <cc/data.h>
 #include <dhcp/pkt4.h>
 #include <http/response.h>
-#include <dhcp/pkt4.h>
 #include <dhcpsrv/lease.h>
 #include <dhcpsrv/network_state.h>
 #include <hooks/parking_lots.h>
 #include <http/client.h>
 #include <util/state_model.h>
+
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <functional>
diff --git a/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc b/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
index 1fea795fcb..adc791e954 100644
--- a/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
+++ b/src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
@@ -5,7 +5,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-
 #include <config.h>
 
 #include <exceptions/exceptions.h>
@@ -16,7 +15,6 @@
 #include <dhcpsrv/cfgmgr.h>
 #include <cc/command_interpreter.h>
 #include <cc/data.h>
-#include <cc/data.h>
 #include <stats/stats_mgr.h>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/src/lib/dhcp/pkt4.h b/src/lib/dhcp/pkt4.h
index 26ded314f1..9613f3af78 100644
--- a/src/lib/dhcp/pkt4.h
+++ b/src/lib/dhcp/pkt4.h
@@ -8,7 +8,6 @@
 #define PKT4_H
 
 #include <asiolink/io_address.h>
-#include <dhcp/option.h>
 #include <dhcp/duid.h>
 #include <util/buffer.h>
 #include <dhcp/option.h>
diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index 16db32afcf..79cc8d54c9 100644
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -29,7 +29,6 @@
 #include <util/encode/hex.h>
 #include <util/stopwatch.h>
 #include <hooks/server_hooks.h>
-#include <hooks/hooks_manager.h>
 
 #include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>
diff --git a/src/lib/dhcpsrv/tests/alloc_engine_utils.cc b/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
index 03d224bfcb..2ca911578e 100644
--- a/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
@@ -21,8 +21,6 @@
 #include <dhcpsrv/testutils/test_utils.h>
 #include <dhcpsrv/tests/alloc_engine_utils.h>
 
-#include <hooks/hooks_manager.h>
-
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 
diff --git a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
index bd07c450c9..accf43a989 100644
--- a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+
 #include <dhcp/classify.h>
 #include <dhcp/libdhcp++.h>
 #include <dhcp/option_custom.h>
@@ -15,14 +16,12 @@
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcpsrv/parsers/dhcp_parsers.h>
-#include <dhcpsrv/shared_network.h>
 #include <dhcpsrv/cfg_shared_networks.h>
 #include <dhcpsrv/cfg_subnets4.h>
 #include <dhcpsrv/shared_network.h>
 #include <dhcpsrv/subnet.h>
 #include <dhcpsrv/subnet_id.h>
 #include <dhcpsrv/subnet_selector.h>
-#include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/cfg_hosts.h>
 #include <stats/stats_mgr.h>
 #include <testutils/gtest_utils.h>
diff --git a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
index a2c940b1da..9d928c5ab0 100644
--- a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+
 #include <dhcp/classify.h>
 #include <dhcp/dhcp6.h>
 #include <dhcp/option.h>
@@ -18,7 +19,6 @@
 #include <dhcpsrv/subnet.h>
 #include <dhcpsrv/subnet_id.h>
 #include <dhcpsrv/subnet_selector.h>
-#include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/cfg_hosts.h>
 #include <stats/stats_mgr.h>
 #include <testutils/gtest_utils.h>
diff --git a/src/lib/dhcpsrv/tests/dhcp4o6_ipc_unittest.cc b/src/lib/dhcpsrv/tests/dhcp4o6_ipc_unittest.cc
index e3c9d010f6..4fbb2a4dab 100644
--- a/src/lib/dhcpsrv/tests/dhcp4o6_ipc_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dhcp4o6_ipc_unittest.cc
@@ -5,8 +5,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+
 #include <dhcp/iface_mgr.h>
-#include <dhcp/option_vendor.h>
 #include <dhcp/pkt6.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcp/option6_addrlst.h>
@@ -15,6 +15,7 @@
 #include <dhcp/option_int.h>
 #include <dhcpsrv/dhcp4o6_ipc.h>
 #include <dhcpsrv/testutils/dhcp4o6_test_ipc.h>
+
 #include <gtest/gtest.h>
 #include <functional>
 #include <sstream>
diff --git a/src/lib/dhcpsrv/tests/subnet_unittest.cc b/src/lib/dhcpsrv/tests/subnet_unittest.cc
index 461edb80af..1eb4d2965d 100644
--- a/src/lib/dhcpsrv/tests/subnet_unittest.cc
+++ b/src/lib/dhcpsrv/tests/subnet_unittest.cc
@@ -13,7 +13,6 @@
 #include <dhcp/option.h>
 #include <dhcp/option_custom.h>
 #include <dhcp/option_definition.h>
-#include <dhcp/dhcp6.h>
 #include <dhcp/option_space.h>
 #include <dhcpsrv/shared_network.h>
 #include <dhcpsrv/subnet.h>
diff --git a/src/lib/eval/tests/context_unittest.cc b/src/lib/eval/tests/context_unittest.cc
index 1670487747..3756d41f54 100644
--- a/src/lib/eval/tests/context_unittest.cc
+++ b/src/lib/eval/tests/context_unittest.cc
@@ -5,7 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <eval/token.h>
+
 #include <eval/eval_context.h>
 #include <eval/token.h>
 #include <dhcp/option.h>
diff --git a/src/lib/hooks/hooks_manager.cc b/src/lib/hooks/hooks_manager.cc
index 5c8985c071..82b741ed25 100644
--- a/src/lib/hooks/hooks_manager.cc
+++ b/src/lib/hooks/hooks_manager.cc
@@ -8,7 +8,6 @@
 
 #include <hooks/callout_handle.h>
 #include <hooks/callout_manager.h>
-#include <hooks/callout_manager.h>
 #include <hooks/library_handle.h>
 #include <hooks/library_manager_collection.h>
 #include <hooks/hooks_manager.h>
diff --git a/src/lib/log/logger_manager.cc b/src/lib/log/logger_manager.cc
index 8742d9109d..a03d2bd5b5 100644
--- a/src/lib/log/logger_manager.cc
+++ b/src/lib/log/logger_manager.cc
@@ -19,7 +19,6 @@
 #include <log/message_dictionary.h>
 #include <log/message_exception.h>
 #include <log/message_initializer.h>
-#include <log/message_initializer.h>
 #include <log/message_reader.h>
 #include <log/message_types.h>
 #include <log/interprocess/interprocess_sync_null.h>
diff --git a/src/lib/log/message_reader.cc b/src/lib/log/message_reader.cc
index f5b0d3907c..834881adfd 100644
--- a/src/lib/log/message_reader.cc
+++ b/src/lib/log/message_reader.cc
@@ -8,7 +8,6 @@
 
 #include <errno.h>
 #include <string.h>
-#include <iostream>
 
 #include <iostream>
 #include <fstream>
diff --git a/tools/check-for-duplicate-includes.sh b/tools/check-for-duplicate-includes.sh
index 60d85acc82..67a2c59542 100755
--- a/tools/check-for-duplicate-includes.sh
+++ b/tools/check-for-duplicate-includes.sh
@@ -102,6 +102,11 @@ root_path=$(cd "$(dirname "${0}")/.." && pwd)
 
 # Generated files will be filtered out. Hardcoded list
 filtered_out=$(cat "${root_path}/tools/.generated-files.txt")
+# src/lib/asiolink/asio_wrapper.h includes <boost/asio.hpp> in both
+# conditionals of an #ifdef. Make an exception for it.
+filtered_out="${filtered_out}
+src/lib/asiolink/asio_wrapper.h
+"
 
 found=false
 for i in $(get_source_files); do