From 203b6ff86fed9564a75d003e2a2c37044493a457 Mon Sep 17 00:00:00 2001 From: Nav Date: Wed, 6 Apr 2022 16:45:57 +0100 Subject: [PATCH] Renamed Packet::dataToHex() member function --- src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp | 2 +- src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp | 2 +- src/DebugServer/Gdb/Packet.hpp | 2 +- src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp b/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp index e3e3512d..d1110a8c 100644 --- a/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp +++ b/src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp @@ -64,7 +64,7 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets this->bytes ); - auto hexMemoryBuffer = Packet::dataToHex(memoryBuffer); + auto hexMemoryBuffer = Packet::toHex(memoryBuffer); debugSession.connection.writePacket( ResponsePacket(std::vector(hexMemoryBuffer.begin(), hexMemoryBuffer.end())) ); diff --git a/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp b/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp index 5c647f80..d20667fb 100644 --- a/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp +++ b/src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp @@ -84,7 +84,7 @@ namespace Bloom::DebugServer::Gdb::CommandPackets registers.insert(registers.end(), reg.value.begin(), reg.value.end()); } - auto responseRegisters = Packet::dataToHex(registers); + auto responseRegisters = Packet::toHex(registers); debugSession.connection.writePacket( ResponsePacket(std::vector(responseRegisters.begin(), responseRegisters.end())) ); diff --git a/src/DebugServer/Gdb/Packet.hpp b/src/DebugServer/Gdb/Packet.hpp index d82a7791..389ea030 100644 --- a/src/DebugServer/Gdb/Packet.hpp +++ b/src/DebugServer/Gdb/Packet.hpp @@ -90,7 +90,7 @@ namespace Bloom::DebugServer::Gdb * @param data * @return */ - static std::string dataToHex(const std::vector& data) { + static std::string toHex(const std::vector& data) { std::stringstream stream; stream << std::hex << std::setfill('0'); diff --git a/src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp b/src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp index f7fd638e..9e1d97da 100644 --- a/src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp +++ b/src/DebugServer/Gdb/ResponsePackets/TargetStopped.hpp @@ -20,7 +20,7 @@ namespace Bloom::DebugServer::Gdb::ResponsePackets explicit TargetStopped(Signal signal): signal(signal) {} [[nodiscard]] std::vector getData() const override { - std::string output = "T" + Packet::dataToHex({static_cast(this->signal)}); + std::string output = "T" + Packet::toHex(std::vector({static_cast(this->signal)})); if (this->stopReason.has_value()) { auto stopReasonMapping = getStopReasonToNameMapping();