BIND 10 trac2108_3, updated. 0f42cb55b2bfdefcea88ed14bfa1c21f2e4b4cc5 [2108] Initialize logging in tests

[BIND 10 source code commits]

The branch, trac2108_3 has been updated
       via  0f42cb55b2bfdefcea88ed14bfa1c21f2e4b4cc5 (commit)
       via  d5e7b615047b7e7d32b6ea9da3db1d3fb0573154 (commit)
       via  d475b8b1a6cd56cdc049cafc1e17311b41baffb2 (commit)
      from  12a6f524849941a162bc814ea9797e0d15eafdac (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 0f42cb55b2bfdefcea88ed14bfa1c21f2e4b4cc5
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Sep 5 18:31:19 2012 +0530

    [2108] Initialize logging in tests

commit d5e7b615047b7e7d32b6ea9da3db1d3fb0573154
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Sep 5 18:31:04 2012 +0530

    [2108] Untabify code

commit d475b8b1a6cd56cdc049cafc1e17311b41baffb2
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Sep 5 18:30:45 2012 +0530

    [2108] Remove use of a scoped_ptr

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

Summary of changes:
 src/lib/datasrc/memory/memory_client.cc       |   23 +++++++++++------------
 src/lib/datasrc/memory/tests/run_unittests.cc |    3 +++
 2 files changed, 14 insertions(+), 12 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index faa7b2d..39b7f13 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -549,24 +549,23 @@ InMemoryClient::InMemoryClientImpl::load(
 {
     SegmentObjectHolder<ZoneData, RRClass> holder(
         local_mem_sgmt_, ZoneData::create(local_mem_sgmt_, zone_name), rrclass_);
-    scoped_ptr<ZoneData> tmp(holder.get());
 
     assert(!last_rrset_);
 
     rrset_installer(boost::bind(&InMemoryClientImpl::addFromLoad, this,
-                                _1, zone_name, tmp.get()));
+                                _1, zone_name, holder.get()));
 
     // Add any last RRset that was left
-    addRdataSet(zone_name, *tmp.get(), ConstRRsetPtr(), ConstRRsetPtr());
+    addRdataSet(zone_name, *holder.get(), ConstRRsetPtr(), ConstRRsetPtr());
 
     assert(!last_rrset_);
 
     // If the zone is NSEC3-signed, check if it has NSEC3PARAM
-    if (tmp->isNSEC3Signed()) {
+    if (holder.get()->isNSEC3Signed()) {
         // Note: origin_data_ is set on creation of ZoneData, and the load
         // process only adds new nodes (and their data), so this assertion
         // should hold.
-        const ZoneNode* origin_node = tmp->getOriginNode();
+        const ZoneNode* origin_node = holder.get()->getOriginNode();
         const RdataSet* set = origin_node->getData();
         if (RdataSet::find(set, RRType::NSEC3PARAM()) == NULL) {
             LOG_WARN(logger, DATASRC_MEM_NO_NSEC3PARAM).
@@ -763,7 +762,7 @@ public:
         if (node_ != NULL && node_->getData() != NULL) {
             set_node_ = node_->getData();
             if (separate_rrs_ && set_node_ != NULL) {
- 	        rrset_.reset(new TreeNodeRRset(rrclass_, node_, set_node_, true));
+                rrset_.reset(new TreeNodeRRset(rrclass_, node_, set_node_, true));
                 rdata_iterator_ = rrset_->getRdataIterator();
             }
         }
@@ -787,10 +786,10 @@ public:
             if (node_ != NULL && node_->getData() != NULL) {
                 set_node_ = node_->getData();
                 // New RRset, so get a new rdata iterator
-		if (separate_rrs_ && set_node_ != NULL) {
-		    rrset_.reset(new TreeNodeRRset(rrclass_, node_, set_node_, true));
-		    rdata_iterator_ = rrset_->getRdataIterator();
-		}
+                if (separate_rrs_ && set_node_ != NULL) {
+                    rrset_.reset(new TreeNodeRRset(rrclass_, node_, set_node_, true));
+                    rdata_iterator_ = rrset_->getRdataIterator();
+                }
             }
         }
         if (node_ == NULL) {
@@ -810,11 +809,11 @@ public:
             rdata_iterator_->next();
             if (rdata_iterator_->isLast()) {
                 // all used up, next.
-	        set_node_ = set_node_->getNext();
+                set_node_ = set_node_->getNext();
                 // New RRset, so get a new rdata iterator, but only if this
                 // was not the final RRset in the chain
                 if (set_node_ != NULL) {
-		    rrset_.reset(new TreeNodeRRset(rrclass_, node_, set_node_, true));
+                    rrset_.reset(new TreeNodeRRset(rrclass_, node_, set_node_, true));
                     rdata_iterator_ = rrset_->getRdataIterator();
                 }
             }
diff --git a/src/lib/datasrc/memory/tests/run_unittests.cc b/src/lib/datasrc/memory/tests/run_unittests.cc
index 998667c..6321976 100644
--- a/src/lib/datasrc/memory/tests/run_unittests.cc
+++ b/src/lib/datasrc/memory/tests/run_unittests.cc
@@ -14,10 +14,13 @@
 
 #include <gtest/gtest.h>
 #include <util/unittests/run_all.h>
+#include <log/logger_support.h>
 
 int
 main(int argc, char* argv[]) {
     ::testing::InitGoogleTest(&argc, argv);
 
+    isc::log::initLogger();
+
     return (isc::util::unittests::run_all());
 }