BIND 10 trac1387, updated. 0c8c0f808a9ddc3a27a87f55964a965fb30f18ef [1387] avoid using 'sun' for a variable name. not declare sockaddr_un as const.

[BIND 10 source code commits]

The branch, trac1387 has been updated
       via  0c8c0f808a9ddc3a27a87f55964a965fb30f18ef (commit)
       via  df44752c7d69b865fa346215c1ec428153d5a3ca (commit)
      from  0ae049de728692224b087e95a645f45f4a69cb68 (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 0c8c0f808a9ddc3a27a87f55964a965fb30f18ef
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Dec 7 10:55:23 2011 -0800

    [1387] avoid using 'sun' for a variable name.  not declare sockaddr_un
    as const.

commit df44752c7d69b865fa346215c1ec428153d5a3ca
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Dec 7 10:48:50 2011 -0800

    [1387] cleanup: removed an unused variable.

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

Summary of changes:
 src/lib/xfr/tests/client_test.cc |    4 ++--
 src/lib/xfr/xfrout_client.cc     |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/xfr/tests/client_test.cc b/src/lib/xfr/tests/client_test.cc
index e968772..6c9f4ad 100644
--- a/src/lib/xfr/tests/client_test.cc
+++ b/src/lib/xfr/tests/client_test.cc
@@ -26,8 +26,8 @@ namespace {
 
 TEST(ClientTest, connetFile) {
     // File path is too long
-    const struct sockaddr_un sun;
-    EXPECT_THROW(XfroutClient(string(sizeof(sun.sun_path), 'x')).connect(),
+    struct sockaddr_un s;     // can't be const; some compiler complains
+    EXPECT_THROW(XfroutClient(string(sizeof(s.sun_path), 'x')).connect(),
                  XfroutError);
 
     // File doesn't exist (we assume the file "no_such_file" doesn't exist)
diff --git a/src/lib/xfr/xfrout_client.cc b/src/lib/xfr/xfrout_client.cc
index b3c6b9c..227ffc4 100644
--- a/src/lib/xfr/xfrout_client.cc
+++ b/src/lib/xfr/xfrout_client.cc
@@ -52,7 +52,6 @@ XfroutClient::~XfroutClient() {
 
 void
 XfroutClient::connect() {
-    asio::error_code err;
     try {
         impl_->socket_.connect(stream_protocol::endpoint(impl_->file_path_));
     } catch (const asio::system_error& err) {