summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-09-13 03:18:46 +0200
committerLioncash <mathew1800@gmail.com>2014-09-13 03:18:46 +0200
commit093d6fbcdca8412ddc49250140e3dfa838811209 (patch)
treedb671af7f6d40afb5b11a5e9150393037fd5e176
parentMerge pull request #105 from kevinhartman/hid (diff)
downloadyuzu-093d6fbcdca8412ddc49250140e3dfa838811209.tar
yuzu-093d6fbcdca8412ddc49250140e3dfa838811209.tar.gz
yuzu-093d6fbcdca8412ddc49250140e3dfa838811209.tar.bz2
yuzu-093d6fbcdca8412ddc49250140e3dfa838811209.tar.lz
yuzu-093d6fbcdca8412ddc49250140e3dfa838811209.tar.xz
yuzu-093d6fbcdca8412ddc49250140e3dfa838811209.tar.zst
yuzu-093d6fbcdca8412ddc49250140e3dfa838811209.zip
-rw-r--r--src/core/core_timing.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 25fccce76..0116cb376 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -7,11 +7,12 @@
#include <atomic>
#include <mutex>
-#include "common/msg_handler.h"
#include "common/chunk_file.h"
+#include "common/msg_handler.h"
+#include "common/string_util.h"
-#include "core/core_timing.h"
#include "core/core.h"
+#include "core/core_timing.h"
int g_clock_rate_arm11 = 268123480;
@@ -586,9 +587,10 @@ std::string GetScheduledEventsSummary()
const char *name = event_types[ptr->type].name;
if (!name)
name = "[unknown]";
- char temp[512];
- sprintf(temp, "%s : %i %08x%08x\n", name, (int)ptr->time, (u32)(ptr->userdata >> 32), (u32)(ptr->userdata));
- text += temp;
+
+ text += Common::StringFromFormat("%s : %i %08x%08x\n", name, (int)ptr->time,
+ (u32)(ptr->userdata >> 32), (u32)(ptr->userdata));
+
ptr = ptr->next;
}
return text;