diff --git a/Common/StringUtils.cpp b/Common/StringUtils.cpp index b244c179ab..ee0159f662 100644 --- a/Common/StringUtils.cpp +++ b/Common/StringUtils.cpp @@ -187,7 +187,7 @@ void DataToHexString(const uint8_t *data, size_t size, std::string *output) { buffer.TakeAll(output); } -void DataToHexString(const char* prefix, uint32_t startAddr, const uint8_t* data, size_t size, std::string* output) { +void DataToHexString(int indent, uint32_t startAddr, const uint8_t* data, size_t size, std::string* output) { Buffer buffer; size_t i = 0; for (; i < size; i++) { @@ -199,7 +199,7 @@ void DataToHexString(const char* prefix, uint32_t startAddr, const uint8_t* data buffer.Printf("\n"); } if (!(i & 15)) - buffer.Printf("%s%08x ", prefix, startAddr + i); + buffer.Printf("%*s%08x ", indent, "", startAddr + i); buffer.Printf("%02x ", data[i]); } if (size & 15) { diff --git a/Common/StringUtils.h b/Common/StringUtils.h index 7a3e879dca..b5a3c28b4d 100644 --- a/Common/StringUtils.h +++ b/Common/StringUtils.h @@ -62,7 +62,7 @@ inline bool endsWithNoCase(const std::string &str, const std::string &what) { } void DataToHexString(const uint8_t *data, size_t size, std::string *output); -void DataToHexString(const char* prefix, uint32_t startAddr, const uint8_t* data, size_t size, std::string* output); +void DataToHexString(int indent, uint32_t startAddr, const uint8_t* data, size_t size, std::string* output); std::string StringFromFormat(const char* format, ...); std::string StringFromInt(int value); diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 510dd88965..0575cd93b7 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -5975,8 +5975,8 @@ void broadcastHelloMessage(SceNetAdhocMatchingContext * context) if (context->hellolen > 0) memcpy(hello + 5, context->hello, context->hellolen); std::string hellohex; - DataToHexString(" ", 0, context->hello, context->hellolen, &hellohex); - DEBUG_LOG(SCENET, "HELLO Dump:\n%s", hellohex.c_str()); + DataToHexString(10, 0, context->hello, context->hellolen, &hellohex); + DEBUG_LOG(SCENET, "HELLO Dump (%d bytes):\n%s", context->hellolen, hellohex.c_str()); // Send Broadcast context->socketlock->lock(); @@ -6416,8 +6416,8 @@ void actOnHelloPacket(SceNetAdhocMatchingContext * context, SceNetEtherAddr * se if (peer != NULL && peer->state != PSP_ADHOC_MATCHING_PEER_OUTGOING_REQUEST && peer->state != PSP_ADHOC_MATCHING_PEER_INCOMING_REQUEST) { std::string hellohex; - DataToHexString(" ", 0, (u8*)opt, optlen, &hellohex); - DEBUG_LOG(SCENET, "HELLO Dump:\n%s", hellohex.c_str()); + DataToHexString(10, 0, (u8*)opt, optlen, &hellohex); + DEBUG_LOG(SCENET, "HELLO Dump (%d bytes):\n%s", optlen, hellohex.c_str()); // Spawn Hello Event. FIXME: HELLO event should not be triggered in the middle of joining? This will cause Bleach 7 to Cancel the join request spawnLocalEvent(context, PSP_ADHOC_MATCHING_EVENT_HELLO, sendermac, optlen, opt);