From e29aab3c38aa126c1eca3e58bc2c87ef81593e06 Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Mon, 30 Jul 2018 16:32:01 +0200 Subject: [PATCH] [5682] addLease() parameter is const again --- src/lib/dhcpsrv/cql_lease_mgr.cc | 4 ++-- src/lib/dhcpsrv/cql_lease_mgr.h | 4 ++-- src/lib/dhcpsrv/lease_mgr.h | 4 ++-- src/lib/dhcpsrv/memfile_lease_mgr.cc | 4 ++-- src/lib/dhcpsrv/memfile_lease_mgr.h | 4 ++-- src/lib/dhcpsrv/mysql_lease_mgr.cc | 4 ++-- src/lib/dhcpsrv/mysql_lease_mgr.h | 4 ++-- src/lib/dhcpsrv/pgsql_lease_mgr.cc | 4 ++-- src/lib/dhcpsrv/pgsql_lease_mgr.h | 4 ++-- src/lib/dhcpsrv/tests/lease_mgr_unittest.cc | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/lib/dhcpsrv/cql_lease_mgr.cc b/src/lib/dhcpsrv/cql_lease_mgr.cc index 01e18af705..7085ff436c 100644 --- a/src/lib/dhcpsrv/cql_lease_mgr.cc +++ b/src/lib/dhcpsrv/cql_lease_mgr.cc @@ -2013,7 +2013,7 @@ CqlLeaseMgr::getDBVersion() { } bool -CqlLeaseMgr::addLease(Lease4Ptr &lease) { +CqlLeaseMgr::addLease(const Lease4Ptr &lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_CQL_ADD_ADDR4) .arg(lease->addr_.toText()); @@ -2032,7 +2032,7 @@ CqlLeaseMgr::addLease(Lease4Ptr &lease) { } bool -CqlLeaseMgr::addLease(Lease6Ptr &lease) { +CqlLeaseMgr::addLease(const Lease6Ptr &lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_CQL_ADD_ADDR6) .arg(lease->addr_.toText()); diff --git a/src/lib/dhcpsrv/cql_lease_mgr.h b/src/lib/dhcpsrv/cql_lease_mgr.h index 653e487abe..39382b2f4e 100644 --- a/src/lib/dhcpsrv/cql_lease_mgr.h +++ b/src/lib/dhcpsrv/cql_lease_mgr.h @@ -87,7 +87,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(Lease4Ptr& lease) override; + virtual bool addLease(const Lease4Ptr& lease) override; /// @brief Adds an IPv6 lease /// @@ -98,7 +98,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(Lease6Ptr& lease) override; + virtual bool addLease(const Lease6Ptr& lease) override; /// @brief Basic lease access methods. Obtain leases from the database using /// various criteria. diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h index 099754875e..642bb6b759 100644 --- a/src/lib/dhcpsrv/lease_mgr.h +++ b/src/lib/dhcpsrv/lease_mgr.h @@ -246,7 +246,7 @@ public: /// /// @result true if the lease was added, false if not (because a lease /// with the same address was already there or failed sanity checks) - virtual bool addLease(Lease4Ptr& lease) = 0; + virtual bool addLease(const Lease4Ptr& lease) = 0; /// @brief Adds an IPv6 lease. /// @@ -259,7 +259,7 @@ public: /// /// @result true if the lease was added, false if not (because a lease /// with the same address was already there or failed sanity checks) - virtual bool addLease(Lease6Ptr& lease) = 0; + virtual bool addLease(const Lease6Ptr& lease) = 0; /// @brief Returns an IPv4 lease for specified IPv4 address /// diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc index 80384af91f..a4b4a1114c 100644 --- a/src/lib/dhcpsrv/memfile_lease_mgr.cc +++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc @@ -690,7 +690,7 @@ Memfile_LeaseMgr::getDBVersion() { } bool -Memfile_LeaseMgr::addLease(Lease4Ptr& lease) { +Memfile_LeaseMgr::addLease(const Lease4Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MEMFILE_ADD_ADDR4).arg(lease->addr_.toText()); @@ -711,7 +711,7 @@ Memfile_LeaseMgr::addLease(Lease4Ptr& lease) { } bool -Memfile_LeaseMgr::addLease(Lease6Ptr& lease) { +Memfile_LeaseMgr::addLease(const Lease6Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MEMFILE_ADD_ADDR6).arg(lease->addr_.toText()); diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h index 196ebb3ad3..66dedccb0d 100644 --- a/src/lib/dhcpsrv/memfile_lease_mgr.h +++ b/src/lib/dhcpsrv/memfile_lease_mgr.h @@ -141,12 +141,12 @@ public: /// @brief Adds an IPv4 lease. /// /// @param lease lease to be added - virtual bool addLease(Lease4Ptr& lease); + virtual bool addLease(const Lease4Ptr& lease); /// @brief Adds an IPv6 lease. /// /// @param lease lease to be added - virtual bool addLease(Lease6Ptr& lease); + virtual bool addLease(const Lease6Ptr& lease); /// @brief Returns existing IPv4 lease for specified IPv4 address. /// diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc index 377ef8c2ed..16c3327ce4 100644 --- a/src/lib/dhcpsrv/mysql_lease_mgr.cc +++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc @@ -1699,7 +1699,7 @@ MySqlLeaseMgr::addLeaseCommon(StatementIndex stindex, } bool -MySqlLeaseMgr::addLease(Lease4Ptr& lease) { +MySqlLeaseMgr::addLease(const Lease4Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_ADD_ADDR4).arg(lease->addr_.toText()); @@ -1711,7 +1711,7 @@ MySqlLeaseMgr::addLease(Lease4Ptr& lease) { } bool -MySqlLeaseMgr::addLease(Lease6Ptr& lease) { +MySqlLeaseMgr::addLease(const Lease6Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_ADD_ADDR6).arg(lease->addr_.toText()) .arg(lease->type_); diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h index 3a777c1b8c..64fe4710a3 100644 --- a/src/lib/dhcpsrv/mysql_lease_mgr.h +++ b/src/lib/dhcpsrv/mysql_lease_mgr.h @@ -74,7 +74,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(Lease4Ptr& lease); + virtual bool addLease(const Lease4Ptr& lease); /// @brief Adds an IPv6 lease /// @@ -85,7 +85,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(Lease6Ptr& lease); + virtual bool addLease(const Lease6Ptr& lease); /// @brief Returns an IPv4 lease for specified IPv4 address /// diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc index c187e3aa40..fc3bc0dfd0 100644 --- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc +++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc @@ -1135,7 +1135,7 @@ PgSqlLeaseMgr::addLeaseCommon(StatementIndex stindex, } bool -PgSqlLeaseMgr::addLease(Lease4Ptr& lease) { +PgSqlLeaseMgr::addLease(const Lease4Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_ADD_ADDR4).arg(lease->addr_.toText()); @@ -1145,7 +1145,7 @@ PgSqlLeaseMgr::addLease(Lease4Ptr& lease) { } bool -PgSqlLeaseMgr::addLease(Lease6Ptr& lease) { +PgSqlLeaseMgr::addLease(const Lease6Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_ADD_ADDR6).arg(lease->addr_.toText()); PsqlBindArray bind_array; diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.h b/src/lib/dhcpsrv/pgsql_lease_mgr.h index 549827dad8..8b69c46b97 100644 --- a/src/lib/dhcpsrv/pgsql_lease_mgr.h +++ b/src/lib/dhcpsrv/pgsql_lease_mgr.h @@ -71,7 +71,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(Lease4Ptr& lease); + virtual bool addLease(const Lease4Ptr& lease); /// @brief Adds an IPv6 lease /// @@ -82,7 +82,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(Lease6Ptr& lease); + virtual bool addLease(const Lease6Ptr& lease); /// @brief Returns an IPv4 lease for specified IPv4 address /// diff --git a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc index 66a6c8ddc2..d32379fe8d 100644 --- a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc @@ -46,14 +46,14 @@ public: /// @brief Adds an IPv4 lease. /// /// @param lease lease to be added - virtual bool addLease(Lease4Ptr&) { + virtual bool addLease(const Lease4Ptr&) { return (false); } /// @brief Adds an IPv6 lease. /// /// @param lease lease to be added - virtual bool addLease(Lease6Ptr&) { + virtual bool addLease(const Lease6Ptr&) { return (false); } -- 2.47.2