[3681_rebase] Changes after review

 - Indent fixed
 - Missing parameter descriptions added

diff --git a/src/lib/dhcpsrv/database_connection.h b/src/lib/dhcpsrv/database_connection.h
index a9dac1c5ca0586c60307d0ae0de2e7a934900bcb..d5d65cea7a37bead5bd7cddaf5521ea1e3bd6602 100755 (executable)
--- a/src/lib/dhcpsrv/database_connection.h
+++ b/src/lib/dhcpsrv/database_connection.h
@@ -90,12 +90,11 @@ public:
     /// @param parameters Database access parameters (output of "parse").
     ///
     /// @return Redacted database access string.
-    static std::string redactedAccessString(
-            const DatabaseConnection::ParameterMap& parameters);
+    static std::string redactedAccessString(const ParameterMap& parameters);
 
 protected:
 
-    /// @brief list of parameters passed in dbconfig
+    /// @brief List of parameters passed in dbconfig
     ///
     /// That will be mostly used for storing database name, username,
     /// password and other parameters required for DB access. It is not

diff --git a/src/lib/dhcpsrv/mysql_connection.h b/src/lib/dhcpsrv/mysql_connection.h
index 03dfdba20838cc3398869f55b0a2e80d2826a3db..9ca68d901f7ef9bbb6b1d6dac42635e3e44db3dc 100755 (executable)
--- a/src/lib/dhcpsrv/mysql_connection.h
+++ b/src/lib/dhcpsrv/mysql_connection.h
@@ -173,6 +173,8 @@ public:
     ///
     /// Creates the prepared statements for all of the SQL statements used
     /// by the MySQL backend.
+    /// @param tagged_statements an array of statements to be compiled
+    /// @param num_statements number of statements in tagged_statements
     ///
     /// @throw isc::dhcp::DbOperationError An operation on the open database has
     ///        failed.

diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h
index b03418f72a34fcb2be6695c1cc0c420ea18714d4..1e25ed4826c5534079458ab7df3f3b6165034fa2 100755 (executable)
--- a/src/lib/dhcpsrv/mysql_lease_mgr.h
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.h
@@ -432,9 +432,6 @@ public:
     };
 
 private:
-    /// @brief MySQL connection
-    MySqlConnection conn_;
-
     /// @brief Add Lease Common Code
     ///
     /// This method performs the common actions for both flavours (V4 and V6)
@@ -611,7 +608,8 @@ private:
     boost::scoped_ptr<MySqlLease4Exchange> exchange4_; ///< Exchange object
     boost::scoped_ptr<MySqlLease6Exchange> exchange6_; ///< Exchange object
 
-
+    /// @brief MySQL connection
+    MySqlConnection conn_;
 };
 
 }; // end of isc::dhcp namespace