mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-12-25 17:21:55 +01:00
Merge pull request #107 from lioncash/sprintf
Core: Replace a sprintf in core_timing with StringFromFormat
This commit is contained in:
commit
1c79a4f10c
@ -7,11 +7,12 @@
|
|||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
|
||||||
#include "common/msg_handler.h"
|
|
||||||
#include "common/chunk_file.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.h"
|
||||||
|
#include "core/core_timing.h"
|
||||||
|
|
||||||
int g_clock_rate_arm11 = 268123480;
|
int g_clock_rate_arm11 = 268123480;
|
||||||
|
|
||||||
@ -586,9 +587,10 @@ std::string GetScheduledEventsSummary()
|
|||||||
const char *name = event_types[ptr->type].name;
|
const char *name = event_types[ptr->type].name;
|
||||||
if (!name)
|
if (!name)
|
||||||
name = "[unknown]";
|
name = "[unknown]";
|
||||||
char temp[512];
|
|
||||||
sprintf(temp, "%s : %i %08x%08x\n", name, (int)ptr->time, (u32)(ptr->userdata >> 32), (u32)(ptr->userdata));
|
text += Common::StringFromFormat("%s : %i %08x%08x\n", name, (int)ptr->time,
|
||||||
text += temp;
|
(u32)(ptr->userdata >> 32), (u32)(ptr->userdata));
|
||||||
|
|
||||||
ptr = ptr->next;
|
ptr = ptr->next;
|
||||||
}
|
}
|
||||||
return text;
|
return text;
|
||||||
|
Loading…
Reference in New Issue
Block a user