From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 23 Jun 2016 14:54:40 +0000 (+0200)
Subject: [master] addressed cpp-check issues detected on Jenkins.
X-Git-Tag: trac4283_base
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=208e7fb05e1ebb7e758b3e8e4cb4e76b6b865cf2;p=thirdparty%2Fkea.git

[master] addressed cpp-check issues detected on Jenkins.
---

diff --git a/src/lib/dhcpsrv/cql_connection.cc b/src/lib/dhcpsrv/cql_connection.cc
index 2b92631184..1dec234ebf 100644
--- a/src/lib/dhcpsrv/cql_connection.cc
+++ b/src/lib/dhcpsrv/cql_connection.cc
@@ -150,7 +150,6 @@ CqlConnection::openDatabase() {
 void
 CqlConnection::prepareStatements(CqlTaggedStatement *statements) {
     CassError rc = CASS_OK;
-    CassFuture* future = NULL;
     uint32_t size = 0;
     tagged_statements_ = statements;
     for (; tagged_statements_[size].params_; size++);
@@ -158,7 +157,7 @@ CqlConnection::prepareStatements(CqlTaggedStatement *statements) {
     for (uint32_t i = 0; i < size; i++) {
         const char* query = tagged_statements_[i].text_;
 
-        future = cass_session_prepare(session_, query);
+        CassFuture* future = cass_session_prepare(session_, query);
         cass_future_wait(future);
         std::string error;
         checkStatementError(error, future, i, "could not prepare statement");
diff --git a/src/lib/dhcpsrv/cql_lease_mgr.cc b/src/lib/dhcpsrv/cql_lease_mgr.cc
index e788976bf7..6ccab4f91c 100644
--- a/src/lib/dhcpsrv/cql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/cql_lease_mgr.cc
@@ -1185,7 +1185,6 @@ CqlLeaseMgr::bindData(CassStatement* statement, const StatementIndex stindex,
 void
 CqlLeaseMgr::getData(const CassRow* row, const int pindex, CqlDataArray& data,
         CqlDataArray& size, const int dindex, const SqlExchange& exchange) {
-    const CassValue* value;
     if (pindex >= exchange.parameters_.size()) {
         return;
     }
@@ -1194,7 +1193,7 @@ CqlLeaseMgr::getData(const CassRow* row, const int pindex, CqlDataArray& data,
     if (std::distance(range.first, range.second) > 0) {
         std::string name = (*range.first)->name_;
         ExchangeDataType type = (*range.first)->type_;
-        value = cass_row_get_column_by_name(row, name.c_str());
+        const CassValue* value = cass_row_get_column_by_name(row, name.c_str());
         if (NULL == value) {
             isc_throw(BadValue, "column name " << name << " doesn't exist");
         }