From aaef83b7776acae7425939f3c900034e3bf1bcd7 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Mon, 4 Dec 2023 20:07:18 +0100 Subject: [PATCH] FEXLoader: Fix incorrect format strings --- Source/Tools/FEXLoader/FEXLoader.cpp | 2 +- Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp | 2 +- Source/Tools/FEXLoader/TestHarnessRunner.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Tools/FEXLoader/FEXLoader.cpp b/Source/Tools/FEXLoader/FEXLoader.cpp index a3501ae13..269682fc2 100644 --- a/Source/Tools/FEXLoader/FEXLoader.cpp +++ b/Source/Tools/FEXLoader/FEXLoader.cpp @@ -461,7 +461,7 @@ int main(int argc, char **argv, char **const envp) { if (!Loader.MapMemory(SyscallHandler.get())) { // failed to map - LogMan::Msg::EFmt("Failed to map %d-bit elf file.", Loader.Is64BitMode() ? 64 : 32); + LogMan::Msg::EFmt("Failed to map {}-bit elf file.", Loader.Is64BitMode() ? 64 : 32); return -ENOEXEC; } } diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp index 2e6ebbef0..1b24c4ff5 100644 --- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp +++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp @@ -108,7 +108,7 @@ namespace FEX::HLE::x64 { #if PRINT_MISSING_SYSCALLS for (auto &Syscall: SyscallNames) { if (Definitions[Syscall.first].Ptr == cvt(&UnimplementedSyscall)) { - LogMan::Msg::DFmt("Unimplemented syscall: %s", Syscall.second); + LogMan::Msg::DFmt("Unimplemented syscall: {}", Syscall.second); } } #endif diff --git a/Source/Tools/FEXLoader/TestHarnessRunner.cpp b/Source/Tools/FEXLoader/TestHarnessRunner.cpp index 9a172a6bb..3b1d018c8 100644 --- a/Source/Tools/FEXLoader/TestHarnessRunner.cpp +++ b/Source/Tools/FEXLoader/TestHarnessRunner.cpp @@ -294,7 +294,7 @@ int main(int argc, char **argv, char **const envp) { // Run through FEX if (!Loader.MapMemory()) { // failed to map - LogMan::Msg::EFmt("Failed to map %d-bit elf file.", Loader.Is64BitMode() ? 64 : 32); + LogMan::Msg::EFmt("Failed to map {}-bit elf file.", Loader.Is64BitMode() ? 64 : 32); return -ENOEXEC; } @@ -324,7 +324,7 @@ int main(int argc, char **argv, char **const envp) { SignalDelegation->RegisterTLSState((FEXCore::Core::InternalThreadState*)UINTPTR_MAX); if (!Loader.MapMemory()) { // failed to map - LogMan::Msg::EFmt("Failed to map %d-bit elf file.", Loader.Is64BitMode() ? 64 : 32); + LogMan::Msg::EFmt("Failed to map {}-bit elf file.", Loader.Is64BitMode() ? 64 : 32); return -ENOEXEC; }