BIND 10 trac1330, updated. 4ca71b858671d112fade23b449f2a59f14d1d300 [1330] a few style fixes

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Nov 9 13:44:49 UTC 2011


The branch, trac1330 has been updated
       via  4ca71b858671d112fade23b449f2a59f14d1d300 (commit)
      from  d2e805bb39d06f0ed47c49879909f35b5d341530 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4ca71b858671d112fade23b449f2a59f14d1d300
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Nov 9 14:44:20 2011 +0100

    [1330] a few style fixes

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/sqlite3_accessor.cc |   20 +++++++++++---------
 src/lib/datasrc/sqlite3_accessor.h  |    1 -
 2 files changed, 11 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/sqlite3_accessor.cc b/src/lib/datasrc/sqlite3_accessor.cc
index 47a1084..0149587 100644
--- a/src/lib/datasrc/sqlite3_accessor.cc
+++ b/src/lib/datasrc/sqlite3_accessor.cc
@@ -658,10 +658,11 @@ public:
             // Last call (if any) didn't reach end of result set, so we
             // can read another row from it.
             //
-            // Get a pointer to the statement for brevity (this does not transfer
-            // ownership of the statement to this class, so there is no need to
-            // tidy up after we have finished using it).
-            sqlite3_stmt* stmt = accessor_->dbparameters_->getStatement(DIFF_RECS);
+            // Get a pointer to the statement for brevity (this does not
+            // transfer ownership of the statement to this class, so there is
+            // no need to tidy up after we have finished using it).
+            sqlite3_stmt* stmt =
+                accessor_->dbparameters_->getStatement(DIFF_RECS);
 
             const int rc(sqlite3_step(stmt));
             if (rc == SQLITE_ROW) {
@@ -691,13 +692,14 @@ private:
     /// \param stindex Index of prepared statement to which to bind
     void reset(int 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 '" <<
-                      text_statements[stindex] << "': " << 
+                      text_statements[stindex] << "': " <<
                       sqlite3_errmsg(accessor_->dbparameters_->db_));
         }
     }
-            
+
     /// \brief Bind Int
     ///
     /// Binds an integer to a specific variable in a prepared statement.
@@ -711,7 +713,7 @@ private:
                              varindex, value) != SQLITE_OK) {
             isc_throw(SQLite3Error, "Could not bind value to parameter " <<
                       varindex << " in statement '" <<
-                      text_statements[stindex] << "': " << 
+                      text_statements[stindex] << "': " <<
                       sqlite3_errmsg(accessor_->dbparameters_->db_));
         }
     }
@@ -825,7 +827,7 @@ private:
                                                               column),
                                           accessor_->dbparameters_->db_);
     }
-    
+
     // Attributes
 
     boost::shared_ptr<const SQLite3Accessor> accessor_; // Accessor object
diff --git a/src/lib/datasrc/sqlite3_accessor.h b/src/lib/datasrc/sqlite3_accessor.h
index c3841f8..79078d3 100644
--- a/src/lib/datasrc/sqlite3_accessor.h
+++ b/src/lib/datasrc/sqlite3_accessor.h
@@ -184,7 +184,6 @@ public:
      */
     virtual IteratorContextPtr
     getDiffs(int id, uint32_t start, uint32_t end) const;
-                                        
 
 
     virtual std::pair<bool, int> startUpdateZone(const std::string& zone_name,




More information about the bind10-changes mailing list