From f9395cd5dda6c9512e9873a6bf9fa0106114a8dd Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Sun, 14 Nov 2021 10:45:18 -0400
Subject: [PATCH] Cleanup: avoid pointless copy of `this` pointer

---
 llarp/lokinet_shared.cpp   |  6 +++---
 llarp/router_version.cpp   |  8 ++++----
 llarp/service/endpoint.cpp | 15 +++++++--------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/llarp/lokinet_shared.cpp b/llarp/lokinet_shared.cpp
index 6b285e20f..7a4891032 100644
--- a/llarp/lokinet_shared.cpp
+++ b/llarp/lokinet_shared.cpp
@@ -153,18 +153,18 @@ struct lokinet_srv_lookup_private
       auto lock = ctx->acquire();
       if (ctx->impl and ctx->impl->IsUp())
       {
-        ctx->impl->CallSafe([host, service, &promise, ctx, self = this]() {
+        ctx->impl->CallSafe([host, service, &promise, ctx, this]() {
           auto ep = ctx->endpoint();
           if (ep == nullptr)
           {
             promise.set_value(ENOTSUP);
             return;
           }
-          ep->LookupServiceAsync(host, service, [self, &promise, host](auto results) {
+          ep->LookupServiceAsync(host, service, [this, &promise, host](auto results) {
             for (const auto& result : results)
             {
               if (auto maybe = SRVFromData(result, host))
-                self->results.emplace_back(*maybe);
+                this->results.emplace_back(*maybe);
             }
             promise.set_value(0);
           });
diff --git a/llarp/router_version.cpp b/llarp/router_version.cpp
index 33c2760f3..c15a7c2a9 100644
--- a/llarp/router_version.cpp
+++ b/llarp/router_version.cpp
@@ -56,7 +56,7 @@ namespace llarp
     Clear();
     size_t idx = 0;
     if (not bencode_read_list(
-            [self = this, &idx](llarp_buffer_t* buffer, bool has) {
+            [this, &idx](llarp_buffer_t* buffer, bool has) {
               if (has)
               {
                 uint64_t i;
@@ -65,14 +65,14 @@ namespace llarp
                   uint64_t val = -1;
                   if (not bencode_read_integer(buffer, &val))
                     return false;
-                  self->m_ProtoVersion = val;
+                  m_ProtoVersion = val;
                 }
                 else if (bencode_read_integer(buffer, &i))
                 {
                   // prevent overflow (note that idx includes version too)
-                  if (idx > self->m_Version.max_size())
+                  if (idx > m_Version.max_size())
                     return false;
-                  self->m_Version[idx - 1] = i;
+                  m_Version[idx - 1] = i;
                 }
                 else
                   return false;
diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index 40537b27d..a83b23932 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -1877,15 +1877,14 @@ namespace llarp
           f.S = m->seqno;
           f.F = p->intro.pathID;
           transfer->P = replyIntro.pathID;
-          auto self = this;
-          Router()->QueueWork([transfer, p, m, K, self]() {
-            if (not transfer->T.EncryptAndSign(*m, K, self->m_Identity))
+          Router()->QueueWork([transfer, p, m, K, this]() {
+            if (not transfer->T.EncryptAndSign(*m, K, m_Identity))
             {
               LogError("failed to encrypt and sign for sessionn T=", transfer->T.T);
               return;
             }
-            self->m_SendQueue.tryPushBack(SendEvent_t{transfer, p});
-            self->Router()->TriggerPump();
+            m_SendQueue.tryPushBack(SendEvent_t{transfer, p});
+            Router()->TriggerPump();
           });
           return true;
         }
@@ -1927,10 +1926,10 @@ namespace llarp
       traffic[remote].emplace_back(data, t);
       EnsurePathToService(
           remote,
-          [self = this](Address addr, OutboundContext* ctx) {
+          [this](Address addr, OutboundContext* ctx) {
             if (ctx)
             {
-              for (auto& pending : self->m_state->m_PendingTraffic[addr])
+              for (auto& pending : m_state->m_PendingTraffic[addr])
               {
                 ctx->AsyncEncryptAndSendTo(pending.Buffer(), pending.protocol);
               }
@@ -1939,7 +1938,7 @@ namespace llarp
             {
               LogWarn("no path made to ", addr);
             }
-            self->m_state->m_PendingTraffic.erase(addr);
+            m_state->m_PendingTraffic.erase(addr);
           },
           PathAlignmentTimeout());
       return true;