From: Razvan Becheriu Date: Tue, 20 Feb 2024 19:44:59 +0000 (+0200) Subject: [#3190] addressed review comments X-Git-Tag: Kea-2.5.7~98 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c25bc2b72be63920004eda8c91a127dd9974f716;p=thirdparty%2Fkea.git [#3190] addressed review comments --- diff --git a/src/bin/netconf/tests/netconf_unittests.cc b/src/bin/netconf/tests/netconf_unittests.cc index 989034028f..7f211539a1 100644 --- a/src/bin/netconf/tests/netconf_unittests.cc +++ b/src/bin/netconf/tests/netconf_unittests.cc @@ -193,7 +193,7 @@ public: : finished_(false), io_service_(new IOService()), thread_(), - agent_(new NakedNetconfAgent) { + agent_(new NakedNetconfAgent()) { } /// @brief Destructor. diff --git a/src/hooks/dhcp/high_availability/tests/ha_impl_unittest.cc b/src/hooks/dhcp/high_availability/tests/ha_impl_unittest.cc index 4f7eb1a5a3..b509ac1e6c 100644 --- a/src/hooks/dhcp/high_availability/tests/ha_impl_unittest.cc +++ b/src/hooks/dhcp/high_availability/tests/ha_impl_unittest.cc @@ -103,7 +103,7 @@ public: /// @param expected_response expected text response. void testSynchronizeHandler(const std::string& ha_sync_command, const std::string& expected_response) { - io_service_.reset(new IOService); + io_service_.reset(new IOService()); ha_impl_.reset(new HAImpl()); ASSERT_NO_THROW(ha_impl_->configure(createValidJsonConfiguration())); diff --git a/src/lib/asiolink/tests/tcp_socket_unittest.cc b/src/lib/asiolink/tests/tcp_socket_unittest.cc index b5b2c6e9d6..1f2ff42b4f 100644 --- a/src/lib/asiolink/tests/tcp_socket_unittest.cc +++ b/src/lib/asiolink/tests/tcp_socket_unittest.cc @@ -234,7 +234,7 @@ serverRead(tcp::socket& socket, TCPCallback& server_cb) { TEST(TCPSocket, processReceivedData) { const uint16_t PACKET_SIZE = 16382; // Amount of "real" data in the buffer - IOServicePtr service(new IOService); // Used to instantiate socket + IOServicePtr service(new IOService()); // Used to instantiate socket TCPSocket test(service); // Socket under test uint8_t inbuff[PACKET_SIZE + 2]; // Buffer to check OutputBufferPtr outbuff(new OutputBuffer(16)); diff --git a/src/lib/cc/data.cc b/src/lib/cc/data.cc index 93308937b9..3fb117ac0f 100644 --- a/src/lib/cc/data.cc +++ b/src/lib/cc/data.cc @@ -1361,7 +1361,7 @@ mergeDiffDel(ElementPtr& element, ElementPtr& other, } return; } - element = ElementPtr(new NullElement); + element = ElementPtr(new NullElement()); } void diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc index 1f5316ff9f..8e5b794be4 100644 --- a/src/lib/dhcp/libdhcp++.cc +++ b/src/lib/dhcp/libdhcp++.cc @@ -1284,7 +1284,7 @@ bool LibDHCP::initOptionDefs() { for (uint32_t i = 0; OPTION_DEF_PARAMS[i].optionDefParams; ++i) { string space = OPTION_DEF_PARAMS[i].space; - option_defs_[space] = OptionDefContainerPtr(new OptionDefContainer); + option_defs_[space] = OptionDefContainerPtr(new OptionDefContainer()); initOptionSpace(option_defs_[space], OPTION_DEF_PARAMS[i].optionDefParams, OPTION_DEF_PARAMS[i].size); diff --git a/src/lib/dhcp_ddns/ncr_io.cc b/src/lib/dhcp_ddns/ncr_io.cc index 48f220f052..a48613b0b7 100644 --- a/src/lib/dhcp_ddns/ncr_io.cc +++ b/src/lib/dhcp_ddns/ncr_io.cc @@ -159,7 +159,7 @@ NameChangeListener::invokeRecvHandler(const Result result, NameChangeSender::NameChangeSender(RequestSendHandler& send_handler, size_t send_queue_max) : sending_(false), send_handler_(send_handler), - send_queue_max_(send_queue_max), mutex_(new mutex) { + send_queue_max_(send_queue_max), mutex_(new mutex()) { // Queue size must be big enough to hold at least 1 entry. setQueueMaxSize(send_queue_max); diff --git a/src/lib/dhcpsrv/testutils/generic_cb_recovery_unittest.cc b/src/lib/dhcpsrv/testutils/generic_cb_recovery_unittest.cc index 8f4e8ba00a..0fa64b369b 100644 --- a/src/lib/dhcpsrv/testutils/generic_cb_recovery_unittest.cc +++ b/src/lib/dhcpsrv/testutils/generic_cb_recovery_unittest.cc @@ -91,7 +91,7 @@ GenericConfigBackendDbLostCallbackTest::testRetryOpenDbLostAndRecoveredCallback( config_ctl_info->addConfigDatabase(access); CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Connect to the CB backend. ASSERT_THROW(addBackend(access), DbOpenErrorWithRetry); @@ -146,7 +146,7 @@ GenericConfigBackendDbLostCallbackTest::testRetryOpenDbLostAndFailedCallback() { config_ctl_info->addConfigDatabase(access); CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Connect to the CB backend. ASSERT_THROW(addBackend(access), DbOpenErrorWithRetry); @@ -194,7 +194,7 @@ GenericConfigBackendDbLostCallbackTest::testRetryOpenDbLostAndRecoveredAfterTime config_ctl_info->addConfigDatabase(access); CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Connect to the CB backend. ASSERT_THROW(addBackend(access), DbOpenErrorWithRetry); @@ -270,7 +270,7 @@ GenericConfigBackendDbLostCallbackTest::testRetryOpenDbLostAndFailedAfterTimeout config_ctl_info->addConfigDatabase(access); CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Connect to the CB backend. ASSERT_THROW(addBackend(access), DbOpenErrorWithRetry); diff --git a/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.cc b/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.cc index e1b4aad01d..e590dbfb41 100644 --- a/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.cc +++ b/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.cc @@ -2685,7 +2685,7 @@ HostMgrDbLostCallbackTest::testRetryOpenDbLostAndRecoveredCallback() { access += " retry-on-startup=true"; CfgMgr::instance().getCurrentCfg()->getCfgDbAccess()->setHostDbAccessString(access); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Create the HostMgr. HostMgr::create(); @@ -2729,7 +2729,7 @@ HostMgrDbLostCallbackTest::testRetryOpenDbLostAndFailedCallback() { access += " retry-on-startup=true"; CfgMgr::instance().getCurrentCfg()->getCfgDbAccess()->setHostDbAccessString(access); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Create the HostMgr. HostMgr::create(); @@ -2769,7 +2769,7 @@ HostMgrDbLostCallbackTest::testRetryOpenDbLostAndRecoveredAfterTimeoutCallback() access += extra; CfgMgr::instance().getCurrentCfg()->getCfgDbAccess()->setHostDbAccessString(access); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Create the HostMgr. HostMgr::create(); @@ -2834,7 +2834,7 @@ HostMgrDbLostCallbackTest::testRetryOpenDbLostAndFailedAfterTimeoutCallback() { access += extra; CfgMgr::instance().getCurrentCfg()->getCfgDbAccess()->setHostDbAccessString(access); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Create the HostMgr. HostMgr::create(); diff --git a/src/lib/dhcpsrv/testutils/generic_lease_mgr_unittest.cc b/src/lib/dhcpsrv/testutils/generic_lease_mgr_unittest.cc index 4ecd933509..475af5fd0e 100644 --- a/src/lib/dhcpsrv/testutils/generic_lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/testutils/generic_lease_mgr_unittest.cc @@ -3427,7 +3427,7 @@ LeaseMgrDbLostCallbackTest::testRetryOpenDbLostAndRecoveredCallback() { access += " retry-on-startup=true"; CfgMgr::instance().getCurrentCfg()->getCfgDbAccess()->setLeaseDbAccessString(access); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Connect to the lease backend. ASSERT_THROW(LeaseMgrFactory::create(access), DbOpenErrorWithRetry); @@ -3468,7 +3468,7 @@ LeaseMgrDbLostCallbackTest::testRetryOpenDbLostAndFailedCallback() { access += " retry-on-startup=true"; CfgMgr::instance().getCurrentCfg()->getCfgDbAccess()->setLeaseDbAccessString(access); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Connect to the lease backend. ASSERT_THROW(LeaseMgrFactory::create(access), DbOpenErrorWithRetry); @@ -3506,7 +3506,7 @@ LeaseMgrDbLostCallbackTest::testRetryOpenDbLostAndRecoveredAfterTimeoutCallback( access += extra; CfgMgr::instance().getCurrentCfg()->getCfgDbAccess()->setLeaseDbAccessString(access); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Connect to the lease backend. ASSERT_THROW(LeaseMgrFactory::create(access), DbOpenErrorWithRetry); @@ -3568,7 +3568,7 @@ LeaseMgrDbLostCallbackTest::testRetryOpenDbLostAndFailedAfterTimeoutCallback() { access += extra; CfgMgr::instance().getCurrentCfg()->getCfgDbAccess()->setLeaseDbAccessString(access); - std::shared_ptr dbr(new DbConnectionInitWithRetry); + std::shared_ptr dbr(new DbConnectionInitWithRetry()); // Connect to the lease backend. ASSERT_THROW(LeaseMgrFactory::create(access), DbOpenErrorWithRetry); diff --git a/src/lib/dns/master_lexer.cc b/src/lib/dns/master_lexer.cc index de598e4860..8853a168ea 100644 --- a/src/lib/dns/master_lexer.cc +++ b/src/lib/dns/master_lexer.cc @@ -126,7 +126,7 @@ struct MasterLexer::MasterLexerImpl { bool previous_was_eol_; }; -MasterLexer::MasterLexer() : impl_(new MasterLexerImpl) { +MasterLexer::MasterLexer() : impl_(new MasterLexerImpl()) { } MasterLexer::~MasterLexer() { diff --git a/src/lib/dns/messagerenderer.cc b/src/lib/dns/messagerenderer.cc index 81b2c92dd2..5c84f78244 100644 --- a/src/lib/dns/messagerenderer.cc +++ b/src/lib/dns/messagerenderer.cc @@ -220,8 +220,8 @@ struct MessageRenderer::MessageRendererImpl { MessageRenderer::MessageRenderer() : AbstractMessageRenderer(), - impl_(new MessageRendererImpl) -{} + impl_(new MessageRendererImpl()) { +} MessageRenderer::~MessageRenderer() { delete impl_; diff --git a/src/lib/dns/rdata/generic/opt_41.cc b/src/lib/dns/rdata/generic/opt_41.cc index 4be20a41c3..326ec383ab 100644 --- a/src/lib/dns/rdata/generic/opt_41.cc +++ b/src/lib/dns/rdata/generic/opt_41.cc @@ -54,7 +54,7 @@ struct OPTImpl { /// \brief Default constructor. OPT::OPT() : - impl_(new OPTImpl) + impl_(new OPTImpl()) { } @@ -84,7 +84,7 @@ OPT::OPT(MasterLexer&, const Name*, OPT::OPT(InputBuffer& buffer, size_t rdata_len) : impl_(NULL) { - std::unique_ptr impl_ptr(new OPTImpl); + std::unique_ptr impl_ptr(new OPTImpl()); while (true) { if (rdata_len == 0) { diff --git a/src/lib/dns/rdataclass.cc b/src/lib/dns/rdataclass.cc index d9cb93f50c..f41db8da62 100644 --- a/src/lib/dns/rdataclass.cc +++ b/src/lib/dns/rdataclass.cc @@ -3689,7 +3689,7 @@ struct OPTImpl { /// \brief Default constructor. OPT::OPT() : - impl_(new OPTImpl) + impl_(new OPTImpl()) { } @@ -3719,7 +3719,7 @@ OPT::OPT(MasterLexer&, const Name*, OPT::OPT(InputBuffer& buffer, size_t rdata_len) : impl_(NULL) { - std::unique_ptr impl_ptr(new OPTImpl); + std::unique_ptr impl_ptr(new OPTImpl()); while (true) { if (rdata_len == 0) { diff --git a/src/lib/dns/tests/rrparamregistry_unittest.cc b/src/lib/dns/tests/rrparamregistry_unittest.cc index 90574d095d..cd14d14180 100644 --- a/src/lib/dns/tests/rrparamregistry_unittest.cc +++ b/src/lib/dns/tests/rrparamregistry_unittest.cc @@ -122,7 +122,7 @@ TEST_F(RRParamRegistryTest, addRemoveFactory) { // Add factories so that we can treat this pair just like in::A. RRParamRegistry::getRegistry().add(test_type_str, test_type_code, test_class_str, test_class_code, - RdataFactoryPtr(new TestRdataFactory)); + RdataFactoryPtr(new TestRdataFactory())); // Now it should be accepted, and should be identical to the same data of // in::A. EXPECT_EQ(0, in::A("192.0.2.1").compare( @@ -135,7 +135,7 @@ TEST_F(RRParamRegistryTest, addRemoveFactory) { InvalidRdataText); // Add the factories also as a class independent RRtype RRParamRegistry::getRegistry().add(test_type_str, test_type_code, - RdataFactoryPtr(new TestRdataFactory)); + RdataFactoryPtr(new TestRdataFactory())); // Now it should be okay for other classes than the test class. EXPECT_EQ(0, in::A("192.0.2.1").compare( *createRdata(RRType(test_type_code), RRClass("IN"), @@ -155,7 +155,7 @@ TEST_F(RRParamRegistryTest, addRemoveFactory) { RdataPtr createRdataHelper(const std::string& str) { - boost::scoped_ptr rdf(new TestRdataFactory); + boost::scoped_ptr rdf(new TestRdataFactory()); std::stringstream ss(str); MasterLexer lexer; diff --git a/src/lib/dns/tsigkey.cc b/src/lib/dns/tsigkey.cc index a32d8c9246..f80d0b86b3 100644 --- a/src/lib/dns/tsigkey.cc +++ b/src/lib/dns/tsigkey.cc @@ -311,7 +311,7 @@ struct TSIGKeyRing::TSIGKeyRingImpl { TSIGKeyMap keys; }; -TSIGKeyRing::TSIGKeyRing() : impl_(new TSIGKeyRingImpl) { +TSIGKeyRing::TSIGKeyRing() : impl_(new TSIGKeyRingImpl()) { } TSIGKeyRing::~TSIGKeyRing() { diff --git a/src/lib/process/tests/d_cfg_mgr_unittests.cc b/src/lib/process/tests/d_cfg_mgr_unittests.cc index 4651a19fba..7cfa746a85 100644 --- a/src/lib/process/tests/d_cfg_mgr_unittests.cc +++ b/src/lib/process/tests/d_cfg_mgr_unittests.cc @@ -59,7 +59,7 @@ class DStubCfgMgrTest : public ConfigParseTest { public: /// @brief Constructor - DStubCfgMgrTest():cfg_mgr_(new DStubCfgMgr) { + DStubCfgMgrTest():cfg_mgr_(new DStubCfgMgr()) { } /// @brief Destructor diff --git a/src/lib/process/tests/daemon_unittest.cc b/src/lib/process/tests/daemon_unittest.cc index fcb5a9a41f..121c530319 100644 --- a/src/lib/process/tests/daemon_unittest.cc +++ b/src/lib/process/tests/daemon_unittest.cc @@ -248,7 +248,7 @@ TEST_F(DaemonTest, createPIDFileOverwrite) { // Verifies that Daemon destruction deletes the PID file TEST_F(DaemonTest, PIDFileCleanup) { boost::shared_ptr instance; - instance.reset(new DaemonImpl); + instance.reset(new DaemonImpl()); instance->setConfigFile("test.conf"); instance->setProcName("daemon_test"); diff --git a/src/lib/stats/stats_mgr.cc b/src/lib/stats/stats_mgr.cc index b420cabc82..99805c778c 100644 --- a/src/lib/stats/stats_mgr.cc +++ b/src/lib/stats/stats_mgr.cc @@ -33,7 +33,7 @@ StatsMgr::instance() { } StatsMgr::StatsMgr() : - global_(boost::make_shared()), mutex_(new mutex) { + global_(boost::make_shared()), mutex_(new mutex()) { } void