From c3c251554239395457ae2153986b622c68046d8b Mon Sep 17 00:00:00 2001
From: sigiesec <simon.giesecke@btc-ag.com>
Date: Mon, 21 Aug 2017 14:33:58 +0200
Subject: [PATCH] Problem: code duplication within zmq::select_t::rm_fd

Solution: extract find_fd_entry_by_handle from rm_fd
---
 src/select.cpp | 41 +++++++++++++++++++----------------------
 src/select.hpp |  3 +++
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/select.cpp b/src/select.cpp
index 96b1dd7b..c6c5f9b1 100644
--- a/src/select.cpp
+++ b/src/select.cpp
@@ -90,6 +90,20 @@ zmq::select_t::handle_t zmq::select_t::add_fd (fd_t fd_, i_poll_events *events_)
     return fd_;
 }
 
+zmq::select_t::fd_entries_t::iterator
+zmq::select_t::find_fd_entry_by_handle (fd_entries_t &fd_entries,
+                                        handle_t handle_)
+{
+    fd_entries_t::iterator fd_entry_it;
+    for (fd_entry_it = fd_entries.begin (); fd_entry_it != fd_entries.end ();
+         ++fd_entry_it)
+        if (fd_entry_it->fd == handle_)
+            break;
+    zmq_assert (fd_entry_it != fd_entries.end ());
+
+    return fd_entry_it;
+}
+
 void zmq::select_t::rm_fd (handle_t handle_)
 {
 #if defined ZMQ_HAVE_WINDOWS
@@ -99,40 +113,23 @@ void zmq::select_t::rm_fd (handle_t handle_)
     family_entries_t::iterator family_entry_it = family_entries.find (family);
     family_entry_t& family_entry = family_entry_it->second;
 
+    fd_entries_t::iterator fd_entry_it =
+      find_fd_entry_by_handle (family_entry.fd_entries, handle_);
     if (family_entry_it != current_family_entry_it) {
         //  Family is not currently being iterated and can be safely
         //  modified in-place. So later it can be skipped without
         //  re-verifying its content.
-        fd_entries_t::iterator fd_entry_it;
-        for (fd_entry_it = family_entry.fd_entries.begin ();
-              fd_entry_it != family_entry.fd_entries.end (); ++fd_entry_it)
-            if (fd_entry_it->fd == handle_)
-                break;
-        zmq_assert (fd_entry_it != family_entry.fd_entries.end ());
-
         family_entry.fd_entries.erase (fd_entry_it);
-        family_entry.fds_set.remove_fd (handle_);
     } else {
         //  Otherwise mark removed entries as retired. It will be cleaned up
         //  at the end of the iteration. See zmq::select_t::loop
-        fd_entries_t::iterator fd_entry_it;
-        for (fd_entry_it = family_entry.fd_entries.begin ();
-              fd_entry_it != family_entry.fd_entries.end (); ++fd_entry_it)
-            if (fd_entry_it->fd == handle_)
-                break;
-        zmq_assert (fd_entry_it != family_entry.fd_entries.end ());
-
         fd_entry_it->fd = retired_fd;
-        family_entry.fds_set.remove_fd (handle_);
         family_entry.retired = true;
     }
+    family_entry.fds_set.remove_fd (handle_);
 #else
-    fd_entries_t::iterator fd_entry_it;
-    for (fd_entry_it = fd_entries.begin ();
-          fd_entry_it != fd_entries.end (); ++fd_entry_it)
-        if (fd_entry_it->fd == handle_)
-            break;
-    zmq_assert (fd_entry_it != fd_entries.end ());
+    fd_entries_t::iterator fd_entry_it =
+      find_fd_entry_by_handle (fd_entries, handle_);
 
     fd_entry_it->fd = retired_fd;
     fds_set.remove_fd (handle_);
diff --git a/src/select.hpp b/src/select.hpp
index 3d91a490..ae046f3d 100644
--- a/src/select.hpp
+++ b/src/select.hpp
@@ -151,6 +151,9 @@ namespace zmq
         //  Checks if an fd_entry_t is retired.
         static bool is_retired_fd (const fd_entry_t &entry);
 
+        static fd_entries_t::iterator
+        find_fd_entry_by_handle (fd_entries_t &fd_entries, handle_t handle_);
+
         //  If true, thread is shutting down.
         bool stopping;