BIND 10 master, updated. 44bf7654cb3ce85fe63fa47c7b39f48bb041d4de Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  44bf7654cb3ce85fe63fa47c7b39f48bb041d4de (commit)
       via  1c8557996bdd428c9a3bf0935c30bf42fb167f35 (commit)
      from  dfbeea4eb3f414dcb66d2447e59216c23dade515 (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 44bf7654cb3ce85fe63fa47c7b39f48bb041d4de
Merge: 1c85579 dfbeea4
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 4 23:32:01 2011 -0800

    Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

commit 1c8557996bdd428c9a3bf0935c30bf42fb167f35
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 4 23:31:16 2011 -0800

    [master] minor editorial fixes: typo in comments, missing braces (style matter)
    skipping review.

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

Summary of changes:
 src/lib/asiolink/tcp_server.cc |    7 ++++---
 src/lib/asiolink/udp_server.cc |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/asiolink/tcp_server.cc b/src/lib/asiolink/tcp_server.cc
index 4389677..df19b00 100644
--- a/src/lib/asiolink/tcp_server.cc
+++ b/src/lib/asiolink/tcp_server.cc
@@ -65,7 +65,7 @@ TCPServer::TCPServer(io_service& io_service,
 
 void
 TCPServer::operator()(error_code ec, size_t length) {
-    /// Because the coroutine reeentry block is implemented as
+    /// Because the coroutine reentry block is implemented as
     /// a switch statement, inline variable declarations are not
     /// permitted.  Certain variables used below can be declared here.
 
@@ -196,9 +196,10 @@ TCPServer::asyncLookup() {
 }
 
 void TCPServer::stop() {
-    //server should not be stopped twice
-    if (stopped_by_hand_)
+    // server should not be stopped twice
+    if (stopped_by_hand_) {
         return;
+    }
 
     stopped_by_hand_ = true;
     acceptor_->close();
diff --git a/src/lib/asiolink/udp_server.cc b/src/lib/asiolink/udp_server.cc
index 841bdc6..98a47c4 100644
--- a/src/lib/asiolink/udp_server.cc
+++ b/src/lib/asiolink/udp_server.cc
@@ -169,7 +169,7 @@ UDPServer::UDPServer(io_service& io_service, const ip::address& addr,
 /// pattern; see internal/coroutine.h for details.
 void
 UDPServer::operator()(error_code ec, size_t length) {
-    /// Because the coroutine reeentry block is implemented as
+    /// Because the coroutine reentry block is implemented as
     /// a switch statement, inline variable declarations are not
     /// permitted.  Certain variables used below can be declared here.