BIND 10 trac1386, updated. 7d90bbbc9310e7e539e2e9898e6334993e66bd1f [1386] cosmetics

[BIND 10 source code commits]

The branch, trac1386 has been updated
       via  7d90bbbc9310e7e539e2e9898e6334993e66bd1f (commit)
       via  0bc14376a9c39fbadba551de7426a8404fa351bb (commit)
      from  05afc74542cdfaeeeece255f7a8174199d36a53b (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 7d90bbbc9310e7e539e2e9898e6334993e66bd1f
Author: Dima Volodin <dvv at isc.org>
Date:   Sat Dec 17 01:18:05 2011 -0500

    [1386]	cosmetics

commit 0bc14376a9c39fbadba551de7426a8404fa351bb
Author: Dima Volodin <dvv at isc.org>
Date:   Sat Dec 17 01:14:02 2011 -0500

    [1386]	src/lib/resolve/tests/recursive_query_unittest_3.cc missing edns_
    	argument

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

Summary of changes:
 src/lib/resolve/recursive_query.cc                 |    2 +-
 .../resolve/tests/recursive_query_unittest_3.cc    |   12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/resolve/recursive_query.cc b/src/lib/resolve/recursive_query.cc
index 4041e33..3b33943 100644
--- a/src/lib/resolve/recursive_query.cc
+++ b/src/lib/resolve/recursive_query.cc
@@ -355,7 +355,7 @@ private:
             IOFetch query(protocol_, io_, question_,
                 test_server_.first,
                 test_server_.second, buffer_, this,
-                query_timeout_);
+                query_timeout_, edns_);
             io_.get_io_service().post(query);
         } else {
             IOFetch query(protocol_, io_, question_,
diff --git a/src/lib/resolve/tests/recursive_query_unittest_3.cc b/src/lib/resolve/tests/recursive_query_unittest_3.cc
index c978aab..bcf472c 100644
--- a/src/lib/resolve/tests/recursive_query_unittest_3.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest_3.cc
@@ -510,14 +510,15 @@ private:
 TEST_F(RecursiveQueryTest3, Resolve) {
     // Set up the UDP server and issue the first read.  The endpoint from which
     // the query is sent is put in udp_endpoint_ when the read completes, which
-    // is referenced in the callback as the place to which the response is sent.
+    // is referenced in the callback as the place to which the response is
+    // sent.
     udp_socket_.set_option(socket_base::reuse_address(true));
     udp_socket_.bind(udp::endpoint(address::from_string(TEST_ADDRESS3),
                                    TEST_PORT3));
     udp_socket_.async_receive_from(asio::buffer(udp_receive_buffer_,
                                                 sizeof(udp_receive_buffer_)),
                                    udp_remote_,
-                                   boost::bind(&RecursiveQueryTest3::udpReceiveHandler,
+                           boost::bind(&RecursiveQueryTest3::udpReceiveHandler,
                                                this, _1, _2));
 
     // Set up the TCP server and issue the accept.  Acceptance will cause the
@@ -528,8 +529,8 @@ TEST_F(RecursiveQueryTest3, Resolve) {
                           boost::bind(&RecursiveQueryTest3::tcpAcceptHandler,
                                       this, _1, 0));
 
-    // Set up the RecursiveQuery object. We will also test that it correctly records
-    // RTT times by setting up a RTT recorder object as well.
+    // Set up the RecursiveQuery object. We will also test that it correctly
+    // records RTT times by setting up a RTT recorder object as well.
     std::vector<std::pair<std::string, uint16_t> > upstream;         // Empty
     std::vector<std::pair<std::string, uint16_t> > upstream_root;    // Empty
     RecursiveQuery query(dns_service_, *nsas_, cache_,
@@ -551,7 +552,8 @@ TEST_F(RecursiveQueryTest3, Resolve) {
     // Check what ran. (We have to cast the callback to ResolverCallback3 as we
     // lost the information on the derived class when we used a
     // ResolverInterface::CallbackPtr to store a pointer to it.)
-    ResolverCallback3* rc = static_cast<ResolverCallback3*>(resolver_callback.get());
+    ResolverCallback3* rc
+                    = static_cast<ResolverCallback3*>(resolver_callback.get());
     EXPECT_TRUE(rc->getRun());
     EXPECT_TRUE(rc->getStatus());