From 3a04fd9b178862c81a62a17e87a2f8a0610dfb07 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Thu, 17 Nov 2022 00:49:59 +0000
Subject: [PATCH] Tidying

---
 README.md                                         |  2 +-
 src/DebugServer/Gdb/Connection.cpp                |  2 +-
 .../DebugSessionInitialisationFailure.hpp         |  8 ++------
 src/Exceptions/Exception.hpp                      | 15 ++++++++++++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index ff5f58da..6f4d0abb 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ src/TargetController/ for more.
 ##### DebugServer
 The DebugServer exposes an interface to the connected target, for third-party programs such as GDB and IDEs (GDB
 front-ends). Currently, Bloom only supports one server - the AVR GDB RSP server. With this server, any AVR compatible
-GDB binary (or any IDE with GDB RSP support) can interface with Bloom and thus the connected AVR target. The
+version of GDB (or any IDE with GDB RSP support) can interface with Bloom and thus the connected AVR target. The
 DebugServer runs on a dedicated thread. See the
 [DebugServer documentation](./src/DebugServer/README.md) and source code in src/DebugServer/ for more.
 
diff --git a/src/DebugServer/Gdb/Connection.cpp b/src/DebugServer/Gdb/Connection.cpp
index 7018a82b..90c0201c 100644
--- a/src/DebugServer/Gdb/Connection.cpp
+++ b/src/DebugServer/Gdb/Connection.cpp
@@ -233,7 +233,7 @@ namespace Bloom::DebugServer::Gdb
                 throw ClientCommunicationError("GDB client attempted to send too much data");
             }
 
-            bytesToRead = (!bytes.has_value() || (*bytes - output.size()) > bufferSize)
+            bytesToRead = !bytes.has_value() || (*bytes - output.size()) > bufferSize
                 ? bufferSize
                 : (*bytes - output.size());
         }
diff --git a/src/DebugServer/Gdb/Exceptions/DebugSessionInitialisationFailure.hpp b/src/DebugServer/Gdb/Exceptions/DebugSessionInitialisationFailure.hpp
index 9914c47a..cf768ed0 100644
--- a/src/DebugServer/Gdb/Exceptions/DebugSessionInitialisationFailure.hpp
+++ b/src/DebugServer/Gdb/Exceptions/DebugSessionInitialisationFailure.hpp
@@ -15,15 +15,11 @@ namespace Bloom::DebugServer::Gdb::Exceptions
     public:
         explicit DebugSessionInitialisationFailure(const std::string& message)
             : Bloom::Exceptions::Exception(message)
-        {
-            this->message = message;
-        }
+        {}
 
         explicit DebugSessionInitialisationFailure(const char* message)
             : Bloom::Exceptions::Exception(message)
-        {
-            this->message = std::string(message);
-        }
+        {}
 
         explicit DebugSessionInitialisationFailure() = default;
     };
diff --git a/src/Exceptions/Exception.hpp b/src/Exceptions/Exception.hpp
index 216a739a..943a7472 100644
--- a/src/Exceptions/Exception.hpp
+++ b/src/Exceptions/Exception.hpp
@@ -7,7 +7,10 @@ namespace Bloom::Exceptions
     class Exception: public std::runtime_error
     {
     public:
-        explicit Exception(): std::runtime_error("") {}
+        explicit Exception()
+            : std::runtime_error("")
+        {}
+
         virtual ~Exception() = default;
 
         Exception(const Exception& other) noexcept = default;
@@ -16,9 +19,15 @@ namespace Bloom::Exceptions
         Exception& operator = (const Exception& other) = default;
         Exception& operator = (Exception&& other) = default;
 
-        explicit Exception(const std::string& message): std::runtime_error(message.c_str()), 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), 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();