Commit 4ca71b85 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

[1330] a few style fixes

parent d2e805bb
...@@ -658,10 +658,11 @@ public: ...@@ -658,10 +658,11 @@ public:
// Last call (if any) didn't reach end of result set, so we // Last call (if any) didn't reach end of result set, so we
// can read another row from it. // can read another row from it.
// //
// Get a pointer to the statement for brevity (this does not transfer // Get a pointer to the statement for brevity (this does not
// ownership of the statement to this class, so there is no need to // transfer ownership of the statement to this class, so there is
// tidy up after we have finished using it). // no need to tidy up after we have finished using it).
sqlite3_stmt* stmt = accessor_->dbparameters_->getStatement(DIFF_RECS); sqlite3_stmt* stmt =
accessor_->dbparameters_->getStatement(DIFF_RECS);
const int rc(sqlite3_step(stmt)); const int rc(sqlite3_step(stmt));
if (rc == SQLITE_ROW) { if (rc == SQLITE_ROW) {
...@@ -691,13 +692,14 @@ private: ...@@ -691,13 +692,14 @@ private:
/// \param stindex Index of prepared statement to which to bind /// \param stindex Index of prepared statement to which to bind
void reset(int stindex) { void reset(int stindex) {
sqlite3_stmt* stmt = accessor_->dbparameters_->getStatement(stindex); sqlite3_stmt* stmt = accessor_->dbparameters_->getStatement(stindex);
if ((sqlite3_reset(stmt) != SQLITE_OK) || (sqlite3_clear_bindings(stmt) != SQLITE_OK)) { if ((sqlite3_reset(stmt) != SQLITE_OK) ||
(sqlite3_clear_bindings(stmt) != SQLITE_OK)) {
isc_throw(SQLite3Error, "Could not clear statement bindings in '" << isc_throw(SQLite3Error, "Could not clear statement bindings in '" <<
text_statements[stindex] << "': " << text_statements[stindex] << "': " <<
sqlite3_errmsg(accessor_->dbparameters_->db_)); sqlite3_errmsg(accessor_->dbparameters_->db_));
} }
} }
/// \brief Bind Int /// \brief Bind Int
/// ///
/// Binds an integer to a specific variable in a prepared statement. /// Binds an integer to a specific variable in a prepared statement.
...@@ -711,7 +713,7 @@ private: ...@@ -711,7 +713,7 @@ private:
varindex, value) != SQLITE_OK) { varindex, value) != SQLITE_OK) {
isc_throw(SQLite3Error, "Could not bind value to parameter " << isc_throw(SQLite3Error, "Could not bind value to parameter " <<
varindex << " in statement '" << varindex << " in statement '" <<
text_statements[stindex] << "': " << text_statements[stindex] << "': " <<
sqlite3_errmsg(accessor_->dbparameters_->db_)); sqlite3_errmsg(accessor_->dbparameters_->db_));
} }
} }
...@@ -825,7 +827,7 @@ private: ...@@ -825,7 +827,7 @@ private:
column), column),
accessor_->dbparameters_->db_); accessor_->dbparameters_->db_);
} }
// Attributes // Attributes
boost::shared_ptr<const SQLite3Accessor> accessor_; // Accessor object boost::shared_ptr<const SQLite3Accessor> accessor_; // Accessor object
......
...@@ -184,7 +184,6 @@ public: ...@@ -184,7 +184,6 @@ public:
*/ */
virtual IteratorContextPtr virtual IteratorContextPtr
getDiffs(int id, uint32_t start, uint32_t end) const; getDiffs(int id, uint32_t start, uint32_t end) const;
virtual std::pair<bool, int> startUpdateZone(const std::string& zone_name, virtual std::pair<bool, int> startUpdateZone(const std::string& zone_name,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment