summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-04-30 03:49:13 +0200
committerGitHub <noreply@github.com>2018-04-30 03:49:13 +0200
commit81a0082f6bd4f2db9b09e56cce96351bb5084e46 (patch)
tree4309e2b742d485f9854bbe63de4393f7e8785f5c /src/core
parentMerge pull request #422 from bunnei/shader-mov (diff)
parentstring_util: Remove StringFromFormat() and related functions (diff)
downloadyuzu-81a0082f6bd4f2db9b09e56cce96351bb5084e46.tar
yuzu-81a0082f6bd4f2db9b09e56cce96351bb5084e46.tar.gz
yuzu-81a0082f6bd4f2db9b09e56cce96351bb5084e46.tar.bz2
yuzu-81a0082f6bd4f2db9b09e56cce96351bb5084e46.tar.lz
yuzu-81a0082f6bd4f2db9b09e56cce96351bb5084e46.tar.xz
yuzu-81a0082f6bd4f2db9b09e56cce96351bb5084e46.tar.zst
yuzu-81a0082f6bd4f2db9b09e56cce96351bb5084e46.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/svc.cpp2
-rw-r--r--src/core/hle/service/service.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 4df38c977..e2da68227 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -510,7 +510,7 @@ static void ExitProcess() {
/// Creates a new thread
static ResultCode CreateThread(Handle* out_handle, VAddr entry_point, u64 arg, VAddr stack_top,
u32 priority, s32 processor_id) {
- std::string name = Common::StringFromFormat("unknown-%llx", entry_point);
+ std::string name = fmt::format("unknown-{:X}", entry_point);
if (priority > THREADPRIO_LOWEST) {
return ERR_OUT_OF_RANGE;
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 94de21ae1..7a5f08b24 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -58,10 +58,9 @@ static std::string MakeFunctionString(const char* name, const char* port_name,
// Number of params == bits 0-5 + bits 6-11
int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F);
- std::string function_string =
- Common::StringFromFormat("function '%s': port=%s", name, port_name);
+ std::string function_string = fmt::format("function '{}': port={}", name, port_name);
for (int i = 1; i <= num_params; ++i) {
- function_string += Common::StringFromFormat(", cmd_buff[%i]=0x%X", i, cmd_buff[i]);
+ function_string += fmt::format(", cmd_buff[{}]={:#X}", i, cmd_buff[i]);
}
return function_string;
}