BIND 10 master, updated. 677c3d840612c58d1cd011adb678e464a904f959 [master] re-add return to make cppcheck happy

[BIND 10 source code commits]

The branch, master has been updated
       via  677c3d840612c58d1cd011adb678e464a904f959 (commit)
      from  67bfb6c60061a86dd0420df77d5cb85af935c634 (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 677c3d840612c58d1cd011adb678e464a904f959
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Mar 11 20:53:10 2011 +0100

    [master] re-add return to make cppcheck happy
    
    added a comment that at this point this is safe

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

Summary of changes:
 ext/asio/asio/detail/kqueue_reactor.hpp |    2 +-
 src/lib/nsas/zone_entry.cc              |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/ext/asio/asio/detail/kqueue_reactor.hpp b/ext/asio/asio/detail/kqueue_reactor.hpp
index 1e118b3..bfa004d 100644
--- a/ext/asio/asio/detail/kqueue_reactor.hpp
+++ b/ext/asio/asio/detail/kqueue_reactor.hpp
@@ -205,7 +205,7 @@ public:
   // Cancel all operations associated with the given descriptor. The
   // handlers associated with the descriptor will be invoked with the
   // operation_aborted error.
-  void cancel_ops(socket_type descriptor, per_descriptor_data& descriptor_data)
+  void cancel_ops(socket_type , per_descriptor_data& descriptor_data)
   {
     mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);
 
diff --git a/src/lib/nsas/zone_entry.cc b/src/lib/nsas/zone_entry.cc
index 16bd71e..36e01d2 100644
--- a/src/lib/nsas/zone_entry.cc
+++ b/src/lib/nsas/zone_entry.cc
@@ -269,6 +269,11 @@ ZoneEntry::removeCallback(const CallbackPtr& callback, AddressFamily family) {
     for (; i != callbacks_[family].end(); ++i) {
         if (*i == callback) {
             callbacks_[family].erase(i);
+            // At this point, a callback should only be in the list
+            // once (enforced by RunningQuery doing only one at a time)
+            // If that changes, we need to revise this (can't delete
+            // elements from a list we're looping over)
+            return;
         }
     }
 }