mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

[master] re-add return to make cppcheck happy

Browse Source 
added a comment that at this point this is safe
This commit is contained in:
Jelte Jansen
2011-03-11 20:53:10 +01:00
parent 67bfb6c600
commit 677c3d8406
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/asio/asio/detail/kqueue_reactor.hpp
View File

@@ -205,7 +205,7 @@ public:
// Cancel all operations associated with the given descriptor. The // Cancel all operations associated with the given descriptor. The
// handlers associated with the descriptor will be invoked with the // handlers associated with the descriptor will be invoked with the
// operation_aborted error. // 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_); mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);

5
src/lib/nsas/zone_entry.cc
View File

@@ -269,6 +269,11 @@ ZoneEntry::removeCallback(const CallbackPtr& callback, AddressFamily family) {
for (; i != callbacks_[family].end(); ++i) { for (; i != callbacks_[family].end(); ++i) {
if (*i == callback) { if (*i == callback) {
callbacks_[family].erase(i); 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;
} }
} }
} }