fixed scripts and compilation errors for different compilers

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 60bf797b8d109ea3538e0563d763cf05d3ec4c64..deff62229d2ea5cb365a13af93d62db5bd296607 100644 (file)
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -203,8 +203,8 @@ pgsql_init() {
 cql_init() {
     printf "Checking if there is a database initialized already... Please ignore errors.\n"
 
-    result=`cql_execute "USE $db_name; DESCRIBE tables;"`
-    if [ "$result"="<empty>" ]; then
+    result=`cql_execute "DESCRIBE tables;"`
+    if [ `echo "$result" | grep "<empty>" | wc -w` -gt 0 ]; then
         printf "Creating and initializing tables using script %s...\n" $scripts_dir/cql/dhcpdb_create.cql
         cql_execute_script $scripts_dir/cql/dhcpdb_create.cql
     else

diff --git a/src/lib/dhcpsrv/cql_exchange.h b/src/lib/dhcpsrv/cql_exchange.h
index ab78b417f07d9d19d7a9080e7ca47c8f7cfe2045..db55fa64716106ce940c3e145c849a25e2463253 100644 (file)
--- a/src/lib/dhcpsrv/cql_exchange.h
+++ b/src/lib/dhcpsrv/cql_exchange.h
@@ -113,12 +113,11 @@ public:
     /// all variables are initialized/set in the methods before they are used.
     CqlVersionExchange() {
         // Set the column names
-        const size_t MAX_COLUMNS = 2U;
         parameters_.push_back(ExchangeColumnInfoPtr(new ExchangeColumnInfo("version",
             parameters_.size(), EXCHANGE_DATA_TYPE_IO_IN_OUT, EXCHANGE_DATA_TYPE_INT32)));
         parameters_.push_back(ExchangeColumnInfoPtr(new ExchangeColumnInfo("minor",
             parameters_.size(), EXCHANGE_DATA_TYPE_IO_IN_OUT, EXCHANGE_DATA_TYPE_INT32)));
-        BOOST_ASSERT(parameters_.size() == MAX_COLUMNS);
+        BOOST_ASSERT(parameters_.size() == 2U);
     }
 };
 

diff --git a/src/lib/dhcpsrv/cql_lease_mgr.cc b/src/lib/dhcpsrv/cql_lease_mgr.cc
index f1641ab26e6a9f9c69c34672c95641b2e84a0b0f..8317464343a6728a3fbb8df78e2f01f0e090b936 100644 (file)
--- a/src/lib/dhcpsrv/cql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/cql_lease_mgr.cc
@@ -407,7 +407,6 @@ public:
     /// all variables are initialized/set in the methods before they are used.
     CqlLease4Exchange() : addr4_(0) {
         // Set the column names
-        const size_t MAX_COLUMNS = 12U;
         parameters_.push_back(ExchangeColumnInfoPtr(new ExchangeColumnInfo("address",
             parameters_.size(), EXCHANGE_DATA_TYPE_IO_IN_OUT, EXCHANGE_DATA_TYPE_INT32)));
         parameters_.push_back(ExchangeColumnInfoPtr(new ExchangeColumnInfo("hwaddr",
@@ -432,7 +431,7 @@ public:
             parameters_.size(), EXCHANGE_DATA_TYPE_IO_IN_OUT, EXCHANGE_DATA_TYPE_INT32)));
         parameters_.push_back(ExchangeColumnInfoPtr(new ExchangeColumnInfo("[applied]",
             parameters_.size(), EXCHANGE_DATA_TYPE_IO_IN_OUT, EXCHANGE_DATA_TYPE_BOOL)));
-        BOOST_ASSERT(parameters_.size() == MAX_COLUMNS);
+        BOOST_ASSERT(parameters_.size() == 12U);
     }
 
     /// @brief Create CQL_BIND objects for Lease4 Pointer
@@ -640,7 +639,6 @@ public:
     CqlLease6Exchange() : pref_lifetime_(0), lease_type_(0), iaid_(0),
                           prefixlen_(0), hwtype_(0), hwaddr_source_(0) {
         // Set the column names
-        const size_t MAX_COLUMNS = 18U;
         parameters_.push_back(ExchangeColumnInfoPtr(new ExchangeColumnInfo("address",
             parameters_.size(), EXCHANGE_DATA_TYPE_IO_IN_OUT, EXCHANGE_DATA_TYPE_STRING)));
         parameters_.push_back(ExchangeColumnInfoPtr(new ExchangeColumnInfo("duid",
@@ -677,7 +675,7 @@ public:
             parameters_.size(), EXCHANGE_DATA_TYPE_IO_IN_OUT, EXCHANGE_DATA_TYPE_INT32)));
         parameters_.push_back(ExchangeColumnInfoPtr(new ExchangeColumnInfo("[applied]",
             parameters_.size(), EXCHANGE_DATA_TYPE_IO_OUT, EXCHANGE_DATA_TYPE_BOOL)));
-        BOOST_ASSERT(parameters_.size() == MAX_COLUMNS);
+        BOOST_ASSERT(parameters_.size() == 18U);
     }
 
     /// @brief Create CQL_BIND objects for Lease6 Pointer