From 065e81879a7a847d03b1f963fef9efa50b2ee4f5 Mon Sep 17 00:00:00 2001
From: Simon Giesecke <simon.giesecke@btc-ag.com>
Date: Thu, 31 Jan 2019 08:22:54 -0500
Subject: [PATCH] Problem: tipc_connector_t::_timer_started is unspecifically
 named

Solution: rename to _reconnect_timer_started
---
 src/tipc_connecter.cpp | 12 ++++++------
 src/tipc_connecter.hpp |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/tipc_connecter.cpp b/src/tipc_connecter.cpp
index 726b9c46..978ab232 100644
--- a/src/tipc_connecter.cpp
+++ b/src/tipc_connecter.cpp
@@ -64,7 +64,7 @@ zmq::tipc_connecter_t::tipc_connecter_t (class io_thread_t *io_thread_,
     _s (retired_fd),
     _handle_valid (false),
     _delayed_start (delayed_start_),
-    _timer_started (false),
+    _reconnect_timer_started (false),
     _session (session_),
     _current_reconnect_ivl (options.reconnect_ivl)
 {
@@ -76,7 +76,7 @@ zmq::tipc_connecter_t::tipc_connecter_t (class io_thread_t *io_thread_,
 
 zmq::tipc_connecter_t::~tipc_connecter_t ()
 {
-    zmq_assert (!_timer_started);
+    zmq_assert (!_reconnect_timer_started);
     zmq_assert (!_handle_valid);
     zmq_assert (_s == retired_fd);
 }
@@ -91,9 +91,9 @@ void zmq::tipc_connecter_t::process_plug ()
 
 void zmq::tipc_connecter_t::process_term (int linger_)
 {
-    if (_timer_started) {
+    if (_reconnect_timer_started) {
         cancel_timer (reconnect_timer_id);
-        _timer_started = false;
+        _reconnect_timer_started = false;
     }
 
     if (_handle_valid) {
@@ -144,7 +144,7 @@ void zmq::tipc_connecter_t::out_event ()
 void zmq::tipc_connecter_t::timer_event (int id_)
 {
     zmq_assert (id_ == reconnect_timer_id);
-    _timer_started = false;
+    _reconnect_timer_started = false;
     start_connecting ();
 }
 
@@ -182,7 +182,7 @@ void zmq::tipc_connecter_t::add_reconnect_timer ()
         int rc_ivl = get_new_reconnect_ivl ();
         add_timer (rc_ivl, reconnect_timer_id);
         _socket->event_connect_retried (_endpoint, rc_ivl);
-        _timer_started = true;
+        _reconnect_timer_started = true;
     }
 }
 
diff --git a/src/tipc_connecter.hpp b/src/tipc_connecter.hpp
index 7a36a85f..d38231d4 100644
--- a/src/tipc_connecter.hpp
+++ b/src/tipc_connecter.hpp
@@ -103,7 +103,7 @@ class tipc_connecter_t : public own_t, public io_object_t
     const bool _delayed_start;
 
     //  True iff a timer has been started.
-    bool _timer_started;
+    bool _reconnect_timer_started;
 
     //  Reference to the session we belong to.
     zmq::session_base_t *_session;