From bfea6b7c8fd7c1808ea83ce5d5d539cc7b60ced6 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Wed, 22 Dec 2021 23:11:18 +0000
Subject: [PATCH] Tidying

---
 .clang-tidy                                      | 1 +
 src/DebugServers/GdbRsp/GdbRspDebugServer.cpp    | 7 ++++---
 src/Exceptions/Exception.hpp                     | 8 ++------
 src/TargetController/TargetControllerConsole.hpp | 5 ++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index f9416c41..782d1ce0 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -16,6 +16,7 @@ Checks: >
   readability-*,
   -modernize-use-trailing-return-type,
   -modernize-avoid-bind,
+  -modernize-pass-by-value,
   -readability-named-parameter,
   -readability-magic-numbers,
   -readability-convert-member-functions-to-static,
diff --git a/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp b/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
index bd59ccbf..6cef9577 100644
--- a/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
+++ b/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
@@ -419,17 +419,18 @@ void GdbRspDebugServer::waitForConnection() {
         throw Exception("Failed to listen on server socket");
     }
 
-    std::array<struct epoll_event, 5> events = {};
+    constexpr int maxEvents = 5;
+    std::array<struct epoll_event, maxEvents> events = {};
     int eventCount = ::epoll_wait(
         this->eventFileDescriptor,
         events.data(),
-        5,
+        maxEvents,
         -1
     );
 
     if (eventCount > 0) {
         for (size_t i = 0; i < eventCount; i++) {
-            auto fileDescriptor = events[i].data.fd;
+            auto fileDescriptor = events.at(i).data.fd;
 
             if (fileDescriptor == this->interruptEventNotifier->getFileDescriptor()) {
                 // Interrupted
diff --git a/src/Exceptions/Exception.hpp b/src/Exceptions/Exception.hpp
index ed49d4ec..2c93ee0c 100644
--- a/src/Exceptions/Exception.hpp
+++ b/src/Exceptions/Exception.hpp
@@ -9,13 +9,9 @@ namespace Bloom::Exceptions
     public:
         explicit Exception(): std::runtime_error("") {}
 
-        explicit Exception(const std::string& message): std::runtime_error(message.c_str()) {
-            this->message = message;
-        }
+        explicit Exception(const std::string& message): std::runtime_error(message.c_str()), message(message) {}
 
-        explicit Exception(const char* message): std::runtime_error(message) {
-            this->message = std::string(message);
-        }
+        explicit Exception(const char* message): std::runtime_error(message), message(std::string(message)) {}
 
         const char* what() const noexcept override {
             return this->message.c_str();
diff --git a/src/TargetController/TargetControllerConsole.hpp b/src/TargetController/TargetControllerConsole.hpp
index 6f3bf9a6..70560e48 100644
--- a/src/TargetController/TargetControllerConsole.hpp
+++ b/src/TargetController/TargetControllerConsole.hpp
@@ -224,10 +224,9 @@ namespace Bloom
                 if (std::holds_alternative<SharedEventPointer<TargetControllerErrorOccurred>>(responseEvent.value())) {
                     auto& tcErrorEvent = std::get<SharedEventPointer<TargetControllerErrorOccurred>>(responseEvent.value());
                     throw Bloom::Exceptions::Exception(tcErrorEvent->errorMessage);
-
-                } else {
-                    throw Bloom::Exceptions::Exception("Unexpected response from TargetController");
                 }
+
+                throw Bloom::Exceptions::Exception("Unexpected response from TargetController");
             }
 
             return std::get<SharedEventPointer<ResponseEventType>>(responseEvent.value());