From: Francis Dupont <fdupont@isc.org>
Date: Fri, 12 Jan 2018 05:11:04 +0000 (+0100)
Subject: [5468] A few trivial fixes
X-Git-Tag: trac5469_base~3
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=369ff550813f817e63d5d70dea00004b1a798821;p=thirdparty%2Fkea.git

[5468] A few trivial fixes
---

diff --git a/src/lib/dhcpsrv/cql_lease_mgr.h b/src/lib/dhcpsrv/cql_lease_mgr.h
index 4f5e24ea3e..f8ffd82d68 100644
--- a/src/lib/dhcpsrv/cql_lease_mgr.h
+++ b/src/lib/dhcpsrv/cql_lease_mgr.h
@@ -183,18 +183,6 @@ public:
                                 const HWAddr& hwaddr,
                                 SubnetID subnet_id) const override;
 
-    /// @brief Returns all IPv4 leases for the particular subnet identifier.
-    ///
-    /// @param subnet_id subnet identifier.
-    ///
-    /// @return Lease collection (may be empty if no IPv4 lease found).
-    virtual Lease4Collection getLeases4(SubnetID subnet_id) const;
-
-    /// @brief Returns all IPv4 leases.
-    ///
-    /// @return Lease collection (may be empty if no IPv4 lease found).
-    virtual Lease4Collection getLeases4() const;
-
     /// @brief Returns existing IPv4 lease for specified client-id
     ///
     /// There can be at most one lease for a given HW address in a single
diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index d5f8ef743d..1a26b44668 100644
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -755,7 +755,7 @@ Lease4Collection
 Memfile_LeaseMgr::getLeases4() const {
    LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MEMFILE_GET4);
 
-    Lease4Collection collection;
+   Lease4Collection collection;
    for (auto lease = storage4_.begin(); lease != storage4_.end(); ++lease ) {
        collection.push_back(Lease4Ptr(new Lease4(**lease)));
    }
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc
index 4c4fe3c5f7..8c70a60afa 100644
--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -1509,7 +1509,7 @@ void MySqlLeaseMgr::getLeaseCollection(StatementIndex stindex,
 
     if (bind) {
         // Bind the selection parameters to the statement
-        int status = mysql_stmt_bind_param(conn_.statements_[stindex], bind);
+        status = mysql_stmt_bind_param(conn_.statements_[stindex], bind);
         checkError(status, stindex, "unable to bind WHERE clause parameter");
     }