From 0c04d7475e15926f657b8c41d02a55c5b83544b0 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Wed, 21 Jun 2023 19:12:11 -0400 Subject: [PATCH] [#2909] Removed obsolete upgradeBinaryAddress func modified: src/lib/dhcpsrv/memfile_lease_mgr.cc src/lib/dhcpsrv/memfile_lease_mgr.h src/lib/dhcpsrv/testutils/concrete_lease_mgr.cc src/lib/dhcpsrv/testutils/concrete_lease_mgr.h --- src/lib/dhcpsrv/memfile_lease_mgr.cc | 5 ----- src/lib/dhcpsrv/memfile_lease_mgr.h | 8 -------- src/lib/dhcpsrv/testutils/concrete_lease_mgr.cc | 5 ----- src/lib/dhcpsrv/testutils/concrete_lease_mgr.h | 4 ---- 4 files changed, 22 deletions(-) diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc index 317814505e..24bdc170f2 100644 --- a/src/lib/dhcpsrv/memfile_lease_mgr.cc +++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc @@ -3461,11 +3461,6 @@ Memfile_LeaseMgr::buildExtendedInfoTables6Internal(bool update, bool current) { return (updated); } -size_t -Memfile_LeaseMgr::upgradeBinaryAddress6(const LeasePageSize& /* page_size */) { - return (0); -} - size_t Memfile_LeaseMgr::buildExtendedInfoTables6(bool update, bool current) { if (MultiThreadingMgr::instance().getMode()) { diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h index 71ec646927..b83264c855 100644 --- a/src/lib/dhcpsrv/memfile_lease_mgr.h +++ b/src/lib/dhcpsrv/memfile_lease_mgr.h @@ -1416,14 +1416,6 @@ public: /// @return The number of updates in the database or 0. size_t extractExtendedInfo4(bool update, bool current); - /// @brief Upgrade binary address (v6). - /// - /// @note: this method is a nop for memfile which uses IOAddress objects. - /// - /// @param page_size The page size used for retrieval. - /// @return Always return 0 as this function is a noop for not SQL backends. - virtual size_t upgradeBinaryAddress6(const LeasePageSize& page_size) override; - /// @brief Build extended info v6 tables. /// /// @param update Update extended info in database. diff --git a/src/lib/dhcpsrv/testutils/concrete_lease_mgr.cc b/src/lib/dhcpsrv/testutils/concrete_lease_mgr.cc index 5d2d4521b2..b24b404bb7 100644 --- a/src/lib/dhcpsrv/testutils/concrete_lease_mgr.cc +++ b/src/lib/dhcpsrv/testutils/concrete_lease_mgr.cc @@ -296,11 +296,6 @@ ConcreteLeaseMgr::upgradeExtendedInfo4(const LeasePageSize& /* page_size */) { return (0); } -size_t -ConcreteLeaseMgr::upgradeBinaryAddress6(const LeasePageSize& /* page_size */) { - return (0); -} - size_t ConcreteLeaseMgr::buildExtendedInfoTables6(bool /* update */, bool /* current */) { diff --git a/src/lib/dhcpsrv/testutils/concrete_lease_mgr.h b/src/lib/dhcpsrv/testutils/concrete_lease_mgr.h index 4a85c26864..53956dc20a 100644 --- a/src/lib/dhcpsrv/testutils/concrete_lease_mgr.h +++ b/src/lib/dhcpsrv/testutils/concrete_lease_mgr.h @@ -381,10 +381,6 @@ public: virtual size_t upgradeExtendedInfo4(const LeasePageSize& /* page_size */) override; - /// @brief Stub implementation. - virtual size_t - upgradeBinaryAddress6(const LeasePageSize& /* page_size */) override; - /// @brief Stub implementation. virtual size_t buildExtendedInfoTables6(bool /* update */, bool /* current */) override; -- 2.47.2