From b0bc663ba10183e724995d4f15a99b457fb3cfd0 Mon Sep 17 00:00:00 2001
From: hamidr <hamidr.dev@gmail.com>
Date: Thu, 12 Jan 2017 14:17:49 +0330
Subject: [PATCH] Remove unnecessary lambda usage

---
 includes/async_redis/sentinel.hpp |  1 -
 src/monitor.cpp                   |  1 -
 src/sentinel.cpp                  | 77 +++++++++++++------------------
 3 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/includes/async_redis/sentinel.hpp b/includes/async_redis/sentinel.hpp
index cbfa04d..0cb3a5f 100644
--- a/includes/async_redis/sentinel.hpp
+++ b/includes/async_redis/sentinel.hpp
@@ -48,7 +48,6 @@ namespace async_redis {
     static std::vector<std::string> parse_watch_master_change(const parser_t& event);
 
   private:
-    bool if_connected_do(std::function<bool ()>&& fn);
     void connect_all(const string& ip, int port, const connect_cb_t& connector);
     void check_connected(const connect_cb_t& connector, bool res);
     bool send(std::list<string>&& words, connection::reply_cb_t&& reply);
diff --git a/src/monitor.cpp b/src/monitor.cpp
index cf9e347..2c3ace3 100644
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -239,7 +239,6 @@ void monitor::stream_received(ssize_t len)
     }
   }
 
-  // if (!(watchers_.size() || pwatchers_.size()))
   if (!watchers_.size() && !pwatchers_.size()) {
     is_watching_ = false;
     return;
diff --git a/src/sentinel.cpp b/src/sentinel.cpp
index 60eef0f..c36dc3d 100644
--- a/src/sentinel.cpp
+++ b/src/sentinel.cpp
@@ -31,46 +31,43 @@ void sentinel::disconnect() {
 
 bool sentinel::failover(const string& clustername, connection::reply_cb_t&& reply)
 {
-  return if_connected_do(
-    [&]() -> bool {
-      return send({std::string("sentinel failover ") + clustername}, std::move(reply));
-    }
-  );
+  if (!is_connected())
+    return false;
+
+  return send({std::string("sentinel failover ") + clustername}, std::move(reply));
 }
 
 bool sentinel::ping(connection::reply_cb_t&& reply)
 {
-  return if_connected_do(
-    [&]() -> bool {
-      return send({"ping"}, std::move(reply));
-    }
-  );
+  if (!is_connected())
+    return false;
+
+  return send({"ping"}, std::move(reply));
 }
 
 bool sentinel::watch_master_change(cb_watch_master_change_t&& fn)
 {
-  return if_connected_do(
-    [&]()-> bool {
-      using State = monitor::EventState;
-
-      return stream_.subscribe({"+switch-master"},
-        [this, fn = std::move(fn)](const string& channel, parser_t event, State state) -> void
-        {
-          switch(state)
-          {
-          case State::Stream:
-            return fn(parse_watch_master_change(event), SentinelState::Watching);
+  if (!is_connected())
+    return false;
 
-          case State::Disconnected:
-            this->disconnect();
-            return fn({}, SentinelState::Disconnected);
-            break;
+  using State = monitor::EventState;
 
-          default:
-            break;
-          }
-        }
-      );
+  return stream_.subscribe({"+switch-master"},
+    [this, fn{std::move(fn)}](const string& channel, parser_t event, State state) -> void
+    {
+      switch(state)
+      {
+      case State::Stream:
+        return fn(parse_watch_master_change(event), SentinelState::Watching);
+
+      case State::Disconnected:
+        this->disconnect();
+        return fn({}, SentinelState::Disconnected);
+        break;
+
+      default:
+        break;
+      }
     }
   );
 }
@@ -78,17 +75,16 @@ bool sentinel::watch_master_change(cb_watch_master_change_t&& fn)
 
 bool sentinel::master_addr_by_name(const string& cluster_name, cb_addr_by_name_t&& cb)
 {
-  return if_connected_do(
-    [&]() -> bool {
-      return send_master_addr_by_name(cluster_name, std::move(cb));
-    }
-  );
+  if (!is_connected())
+    return false;
+
+  return send_master_addr_by_name(cluster_name, std::move(cb));
 }
 
 bool sentinel::send_master_addr_by_name(const string& cluster_name, cb_addr_by_name_t&& cb)
 {
   return this->send({string("SENTINEL get-master-addr-by-name ") + cluster_name + "\r\n"},
-    [cb = std::move(cb)](parser_t parsed_value)
+    [cb{std::move(cb)}](parser_t parsed_value)
     {
       using ::async_redis::parser::RespType;
 
@@ -122,7 +118,6 @@ bool sentinel::send_master_addr_by_name(const string& cluster_name, cb_addr_by_n
   );
 }
 
-// static
 std::vector<std::string> sentinel::parse_watch_master_change(const parser_t& event)
 {
   std::vector<string> words;
@@ -135,14 +130,6 @@ std::vector<std::string> sentinel::parse_watch_master_change(const parser_t& eve
   return words;
 }
 
-bool sentinel::if_connected_do(std::function<bool ()>&& fn)
-{
-  if (!is_connected())
-    return false;
-
-  return fn();
-}
-
 void sentinel::connect_all(const string& ip, int port, const connect_cb_t& connector)
 {
   auto cb = std::bind(&sentinel::check_connected, this, connector, std::placeholders::_1);