From: Kefu Chai <kchai@redhat.com>
Date: Sun, 5 Jan 2020 14:15:24 +0000 (+0800)
Subject: crimson: do not capture unused variables
X-Git-Tag: v15.1.0~334^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba0fc1fef3590da3edeb8294093d276e9c5cb6ca;p=ceph.git

crimson: do not capture unused variables

to silence warnings like

src/crimson/net/Socket.cc:93:41: warning: lambda capture 'this' is not
used [-Wunused-lambda-capture]
    return in.read_exactly(bytes).then([this](auto buf) {
                                        ^~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index 8aa0b2589d0a..117b9b3ebd8e 100644
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -1,3 +1,5 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+
 #include "MonClient.h"
 
 #include <random>
@@ -988,10 +990,10 @@ seastar::future<> Client::reopen_session(int rank)
       found->reset();
       auto ret = seastar::do_with(
 	std::move(pending_conns),
-	[this](auto &pending_conns) {
+	[](auto &pending_conns) {
 	  return seastar::parallel_for_each(
 	    pending_conns,
-	    [this] (auto &conn) {
+	    [] (auto &conn) {
 	      if (!conn) {
 		return seastar::now();
 	      } else {
diff --git a/src/crimson/net/Interceptor.h b/src/crimson/net/Interceptor.h
index 858be0a38e03..fcd3ea6f469c 100644
--- a/src/crimson/net/Interceptor.h
+++ b/src/crimson/net/Interceptor.h
@@ -62,7 +62,7 @@ class socket_blocker {
       return seastar::now();
     } else {
       p_blocked = seastar::abort_source();
-      return seastar::sleep_abortable(10s, *p_blocked).then([this] {
+      return seastar::sleep_abortable(10s, *p_blocked).then([] {
         throw std::runtime_error(
             "Timeout (10s) in socket_blocker::wait_blocked()");
       }).handle_exception_type([] (const seastar::sleep_aborted& e) {
@@ -78,7 +78,7 @@ class socket_blocker {
     }
     ceph_assert(!p_unblocked);
     p_unblocked = seastar::abort_source();
-    return seastar::sleep_abortable(10s, *p_unblocked).then([this] {
+    return seastar::sleep_abortable(10s, *p_unblocked).then([] {
       ceph_abort("Timeout (10s) in socket_blocker::block()");
     }).handle_exception_type([] (const seastar::sleep_aborted& e) {
       // wait done!
diff --git a/src/crimson/net/Socket.cc b/src/crimson/net/Socket.cc
index 43affbbdf79e..4effb94ee8e7 100644
--- a/src/crimson/net/Socket.cc
+++ b/src/crimson/net/Socket.cc
@@ -90,7 +90,7 @@ Socket::read_exactly(size_t bytes) {
     if (bytes == 0) {
       return seastar::make_ready_future<seastar::temporary_buffer<char>>();
     }
-    return in.read_exactly(bytes).then([this](auto buf) {
+    return in.read_exactly(bytes).then([](auto buf) {
       if (buf.empty()) {
         throw std::system_error(make_error_code(error::read_eof));
       }