From a13eb1a9d8448af92e3b70b7e5c91137f2c5e36a Mon Sep 17 00:00:00 2001
From: Simon Giesecke <simon.giesecke@btc-ag.com>
Date: Thu, 31 Jan 2019 08:35:49 -0500
Subject: [PATCH] Problem: ipc_connector_t::_handle_valid is redundant

Solution: replace by checks against valid value of _handle
---
 src/ipc_connecter.cpp | 12 +++++-------
 src/ipc_connecter.hpp |  4 ----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp
index f49ce7b8..75fec119 100644
--- a/src/ipc_connecter.cpp
+++ b/src/ipc_connecter.cpp
@@ -60,7 +60,7 @@ zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
     io_object_t (io_thread_),
     _addr (addr_),
     _s (retired_fd),
-    _handle_valid (false),
+    _handle (static_cast<handle_t> (NULL)),
     _delayed_start (delayed_start_),
     _reconnect_timer_started (false),
     _session (session_),
@@ -75,7 +75,7 @@ zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
 zmq::ipc_connecter_t::~ipc_connecter_t ()
 {
     zmq_assert (!_reconnect_timer_started);
-    zmq_assert (!_handle_valid);
+    zmq_assert (_handle == static_cast<handle_t> (NULL));
     zmq_assert (_s == retired_fd);
 }
 
@@ -94,9 +94,9 @@ void zmq::ipc_connecter_t::process_term (int linger_)
         _reconnect_timer_started = false;
     }
 
-    if (_handle_valid) {
+    if (_handle) {
         rm_fd (_handle);
-        _handle_valid = false;
+        _handle = static_cast<handle_t> (NULL);
     }
 
     if (_s != retired_fd)
@@ -117,7 +117,7 @@ void zmq::ipc_connecter_t::out_event ()
 {
     fd_t fd = connect ();
     rm_fd (_handle);
-    _handle_valid = false;
+    _handle = static_cast<handle_t> (NULL);
 
     //  Handle the error condition by attempt to reconnect.
     if (fd == retired_fd) {
@@ -154,14 +154,12 @@ void zmq::ipc_connecter_t::start_connecting ()
     //  Connect may succeed in synchronous manner.
     if (rc == 0) {
         _handle = add_fd (_s);
-        _handle_valid = true;
         out_event ();
     }
 
     //  Connection establishment may be delayed. Poll for its completion.
     else if (rc == -1 && errno == EINPROGRESS) {
         _handle = add_fd (_s);
-        _handle_valid = true;
         set_pollout (_handle);
         _socket->event_connect_delayed (_endpoint, zmq_errno ());
     }
diff --git a/src/ipc_connecter.hpp b/src/ipc_connecter.hpp
index c7957cf8..d3bb3f2c 100644
--- a/src/ipc_connecter.hpp
+++ b/src/ipc_connecter.hpp
@@ -104,10 +104,6 @@ class ipc_connecter_t : public own_t, public io_object_t
     //  Handle corresponding to the listening socket.
     handle_t _handle;
 
-    //  If true file descriptor is registered with the poller and 'handle'
-    //  contains valid value.
-    bool _handle_valid;
-
     //  If true, connecter is waiting a while before trying to connect.
     const bool _delayed_start;