ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core/IOS/ES: Make use of fmt::format where applicable 

Eliminates a deprecation warnings on macOS. While we're in the
same area, we can remove the call to GetPointer() and instead
use CopyToEmu() to copy the string data back to the emulated memory.
This commit is contained in:
Lioncache 2023-12-18 10:05:48 -05:00
parent 715a551dac
commit 04822d5a2c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/IOS/ES/ES.cpp
View File

@ -9,6 +9,8 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <fmt/format.h>
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/EnumUtils.h" #include "Common/EnumUtils.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
@ -218,10 +220,11 @@ IPCReply ESDevice::GetTitleDirectory(const IOCtlVRequest& request)
auto& memory = system.GetMemory(); auto& memory = system.GetMemory();
const u64 title_id = memory.Read_U64(request.in_vectors[0].address); const u64 title_id = memory.Read_U64(request.in_vectors[0].address);
const auto path = fmt::format("/title/{:08x}/{:08x}/data", static_cast<u32>(title_id >> 32),
static_cast<u32>(title_id));
char* path = reinterpret_cast<char*>(memory.GetPointer(request.io_vectors[0].address)); const auto path_dst = request.io_vectors[0].address;
sprintf(path, "/title/%08x/%08x/data", static_cast<u32>(title_id >> 32), memory.CopyToEmu(path_dst, path.data(), path.size());
static_cast<u32>(title_id));
INFO_LOG_FMT(IOS_ES, "IOCTL_ES_GETTITLEDIR: {}", path); INFO_LOG_FMT(IOS_ES, "IOCTL_ES_GETTITLEDIR: {}", path);
return IPCReply(IPC_SUCCESS); return IPCReply(IPC_SUCCESS);