From ab1a379efa9849eaa223f66ab183c0a7789354b2 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 19 Mar 2022 15:17:07 +0000
Subject: [PATCH] Tidying

---
 src/DebugServers/DebugServer.hpp              | 8 ++++----
 src/DebugServers/GdbRsp/GdbRspDebugServer.cpp | 2 +-
 src/DebugServers/GdbRsp/GdbRspDebugServer.hpp | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/DebugServers/DebugServer.hpp b/src/DebugServers/DebugServer.hpp
index cd42eae3..8f9140c4 100644
--- a/src/DebugServers/DebugServer.hpp
+++ b/src/DebugServers/DebugServer.hpp
@@ -53,6 +53,10 @@ namespace Bloom::DebugServers
         EventManager& eventManager;
         EventListenerPointer eventListener = std::make_shared<EventListener>("DebugServerEventListener");
 
+        ProjectConfig projectConfig;
+        EnvironmentConfig environmentConfig;
+        DebugServerConfig debugServerConfig;
+
         TargetControllerConsole targetControllerConsole = TargetControllerConsole(
             this->eventManager,
             *(this->eventListener)
@@ -63,10 +67,6 @@ namespace Bloom::DebugServers
          */
         std::shared_ptr<EventNotifier> interruptEventNotifier = nullptr;
 
-        ProjectConfig projectConfig;
-        EnvironmentConfig environmentConfig;
-        DebugServerConfig debugServerConfig;
-
         Targets::TargetDescriptor targetDescriptor;
 
         /**
diff --git a/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp b/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
index 650593bf..20a65a85 100644
--- a/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
+++ b/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
@@ -303,7 +303,7 @@ namespace Bloom::DebugServers::Gdb
             );
         }
 
-        int socketFileDescriptor;
+        int socketFileDescriptor = 0;
 
         if ((socketFileDescriptor = ::socket(AF_INET, SOCK_STREAM, 0)) == 0) {
             throw Exception("Failed to create socket file descriptor.");
diff --git a/src/DebugServers/GdbRsp/GdbRspDebugServer.hpp b/src/DebugServers/GdbRsp/GdbRspDebugServer.hpp
index 0d0547a2..aa19fb5b 100644
--- a/src/DebugServers/GdbRsp/GdbRspDebugServer.hpp
+++ b/src/DebugServers/GdbRsp/GdbRspDebugServer.hpp
@@ -6,7 +6,7 @@
 #include <queue>
 #include <cstdint>
 
-#include "../DebugServer.hpp"
+#include "src/DebugServers/DebugServer.hpp"
 
 #include "GdbDebugServerConfig.hpp"
 
@@ -14,9 +14,11 @@
 #include "Signal.hpp"
 #include "RegisterDescriptor.hpp"
 #include "Feature.hpp"
+#include "CommandPackets/CommandPacketFactory.hpp"
+
 #include "src/Helpers/EventNotifier.hpp"
 #include "src/Helpers/BiMap.hpp"
-#include "CommandPackets/CommandPacketFactory.hpp"
+
 #include "src/Targets/TargetRegister.hpp"
 
 // Response packets