mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[master] Remove indirection in defining size of arrays

Browse Source 
cppcheck was complaining about what was effectively:
const int A = 6; const int B = A; std::string array[b];

Changing this to
const int B = 6; std::string array[b];

... works
This commit is contained in:
Stephen Morris
2012-12-07 20:25:25 +00:00
parent 755a3b5fa1
commit 5c9dba4001
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/dhcpsrv/mysql_lease_mgr.cc
View File

@@ -95,12 +95,6 @@ const size_t ADDRESS6_TEXT_MAX_LEN = 39;
/// @brief Maximum size of a hardware address.
const size_t HWADDR_MAX_LEN = 20;
/// @brief Number of columns in Lease4 table
const size_t LEASE4_COLUMNS = 6;
/// @brief Number of columns in Lease6 table
const size_t LEASE6_COLUMNS = 9;
/// @brief MySQL True/False constants
///
/// Declare typed values so as to avoid problems of data conversion. These
@@ -279,10 +273,10 @@ public:
/// in all MySqlLeaseMgr::xxx4() calls where it is used.
class MySqlLease4Exchange : public MySqlLeaseExchange {
public:
/// @brief Set number of columns in this lease structure
static const size_t LEASE_COLUMNS = LEASE4_COLUMNS;
/// @brief Set number of database columns for this lease structure
static const size_t LEASE_COLUMNS = 6;
public:
/// @brief Constructor
///
/// The initialization of the variables here is only to satisfy cppcheck -
@@ -512,8 +506,8 @@ private:
/// in all MySqlLeaseMgr::xxx6() calls where it is used.
class MySqlLease6Exchange : public MySqlLeaseExchange {
/// @brief Set number of columns in this lease structure
static const size_t LEASE_COLUMNS = LEASE6_COLUMNS;
/// @brief Set number of database columns for this lease structure
static const size_t LEASE_COLUMNS = 9;
public:
/// @brief Constructor
@@ -535,7 +529,7 @@ public:
columns_[6] = "lease_type";
columns_[7] = "iaid";
columns_[8] = "prefix_len";
BOOST_STATIC_ASSERT(5 < LEASE_COLUMNS);
BOOST_STATIC_ASSERT(8 < LEASE_COLUMNS);
}
/// @brief Create MYSQL_BIND objects for Lease6 Pointer