BIND 10 trac739, updated. f80bba65ac947cdc2f99253623e976c815b63140 [trac739] Changes after review

[BIND 10 source code commits]

The branch, trac739 has been updated
       via  f80bba65ac947cdc2f99253623e976c815b63140 (commit)
      from  a94c70e333e3082a55f8a82ff026aae9b35964ad (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 f80bba65ac947cdc2f99253623e976c815b63140
Author: Stephen Morris <stephen at isc.org>
Date:   Wed May 25 12:13:44 2011 +0100

    [trac739] Changes after review

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

Summary of changes:
 src/bin/resolver/main.cc     |    1 -
 src/bin/resolver/resolver.cc |    8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/resolver/main.cc b/src/bin/resolver/main.cc
index f79899f..b0776ea 100644
--- a/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@ -52,7 +52,6 @@
 #include <cache/resolver_cache.h>
 #include <nsas/nameserver_address_store.h>
 
-#include <log/macros.h>
 #include <log/logger_support.h>
 #include <log/debug_levels.h>
 #include "resolver_log.h"
diff --git a/src/bin/resolver/resolver.cc b/src/bin/resolver/resolver.cc
index f4ea81b..6028bac 100644
--- a/src/bin/resolver/resolver.cc
+++ b/src/bin/resolver/resolver.cc
@@ -303,7 +303,7 @@ public:
         answer_message->toWire(renderer);
 
         LOG_DEBUG(resolver_logger, RESOLVER_DBG_DETAIL, RESOLVER_DNSMSGSENT)
-                  .arg(renderer.getLength()).arg(answer_message->toText());
+                  .arg(renderer.getLength()).arg(*answer_message);
     }
 };
 
@@ -427,7 +427,7 @@ Resolver::processMessage(const IOMessage& io_message,
     // message.  This is not an oversight - it is handled below.  In the
     // meantime, output the full message for debug purposes (if requested).
     LOG_DEBUG(resolver_logger, RESOLVER_DBG_DETAIL, RESOLVER_DNSMSGRCVD)
-              .arg(query_message->toText());
+              .arg(*query_message);
 
     // Perform further protocol-level validation.
     bool sendAnswer = true;
@@ -442,7 +442,7 @@ Resolver::processMessage(const IOMessage& io_message,
 
         // Unsupported opcode.
         LOG_DEBUG(resolver_logger, RESOLVER_DBG_PROCESS, RESOLVER_OPCODEUNS)
-                  .arg(query_message->getOpcode().toText());
+                  .arg(query_message->getOpcode());
         makeErrorMessage(query_message, answer_message,
                          buffer, Rcode::NOTIMP());
 
@@ -530,7 +530,7 @@ ResolverImpl::processNormalQuery(ConstMessagePtr query_message,
 ConstElementPtr
 Resolver::updateConfig(ConstElementPtr config) {
     LOG_DEBUG(resolver_logger, RESOLVER_DBG_CONFIG, RESOLVER_CONFIGUPD)
-              .arg(config->toWire());
+              .arg(*config);
 
     try {
         // Parse forward_addresses