yuzu-emu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC.git synced 2024-12-01 00:44:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows issues with blockstats...

Browse Source
This commit is contained in:
Pavel Krajcevski 2012-11-07 16:52:06 -05:00
parent 562d9e905d
commit 05e6ca0bc9
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/include/BlockStats.h
View File

@ -14,7 +14,7 @@ public:
BlockStat(const BlockStat &); BlockStat(const BlockStat &);
BlockStat &operator=(const BlockStat &); BlockStat &operator=(const BlockStat &);
void ToString(char *buf, int bufSz) const; void ToString(CHAR *buf, int bufSz) const;
private: private:
const enum Type { const enum Type {

29
Core/src/BlockStats.cpp
View File

@ -22,14 +22,22 @@ BlockStat::BlockStat(const CHAR *statName, int stat)
: m_IntStat(stat) : m_IntStat(stat)
, m_Type(eType_Int) , m_Type(eType_Int)
{ {
#ifdef _MSC_VER
strncpy_s(m_StatName, statName, kStatNameSz);
#else
strncpy(m_StatName, statName, kStatNameSz); strncpy(m_StatName, statName, kStatNameSz);
#endif
} }
BlockStat::BlockStat(const CHAR *statName, double stat) BlockStat::BlockStat(const CHAR *statName, double stat)
: m_FloatStat(stat) : m_FloatStat(stat)
, m_Type(eType_Float) , m_Type(eType_Float)
{ {
#ifdef _MSC_VER
strncpy_s(m_StatName, statName, kStatNameSz);
#else
strncpy(m_StatName, statName, kStatNameSz); strncpy(m_StatName, statName, kStatNameSz);
#endif
} }
BlockStat::BlockStat(const BlockStat &other) : m_Type(other.m_Type) { BlockStat::BlockStat(const BlockStat &other) : m_Type(other.m_Type) {
@ -38,16 +46,25 @@ BlockStat::BlockStat(const BlockStat &other) : m_Type(other.m_Type) {
BlockStat &BlockStat::operator=(const BlockStat &other) { BlockStat &BlockStat::operator=(const BlockStat &other) {
memcpy(this, &other, sizeof(*this)); memcpy(this, &other, sizeof(*this));
return *this;
} }
void BlockStat::ToString(char *buf, int bufSz) const { void BlockStat::ToString(CHAR *buf, int bufSz) const {
switch(m_Type) { switch(m_Type) {
case BlockStat::eType_Float: case BlockStat::eType_Float:
#ifdef _MSC_VER
_sntprintf_s(buf, bufSz, _TRUNCATE, "%s,%f", m_StatName, m_FloatStat);
#else
snprintf(buf, bufSz, "%s,%f", m_StatName, m_FloatStat); snprintf(buf, bufSz, "%s,%f", m_StatName, m_FloatStat);
#endif
break; break;
case BlockStat::eType_Int: case BlockStat::eType_Int:
#ifdef _MSC_VER
_sntprintf_s(buf, bufSz, _TRUNCATE, "%s,%llu", m_StatName, m_IntStat);
#else
snprintf(buf, bufSz, "%s,%llu", m_StatName, m_IntStat); snprintf(buf, bufSz, "%s,%llu", m_StatName, m_IntStat);
#endif
break; break;
default: default:
@ -106,7 +123,7 @@ void BlockStatManager::ToFile(const CHAR *filename) {
FileStream fstr (filename, eFileMode_Write); FileStream fstr (filename, eFileMode_Write);
for(int i = 0; i < m_BlockStatListSz; i++) { for(uint32 i = 0; i < m_BlockStatListSz; i++) {
const BlockStatList *head = &(m_BlockStatList[i]); const BlockStatList *head = &(m_BlockStatList[i]);
while(head) { while(head) {
BlockStat s = head->GetStat(); BlockStat s = head->GetStat();
@ -115,9 +132,13 @@ void BlockStatManager::ToFile(const CHAR *filename) {
s.ToString(statStr, 256); s.ToString(statStr, 256);
CHAR str[256]; CHAR str[256];
#ifdef _MSC_VER
_sntprintf_s(str, 256, _TRUNCATE, "%d,%s\n", i, statStr);
#else
snprintf(str, 256, "%d,%s\n", i, statStr); snprintf(str, 256, "%d,%s\n", i, statStr);
#endif
int strLen = strlen(str); uint32 strLen = uint32(strlen(str));
if(strLen > 255) { if(strLen > 255) {
str[255] = '\n'; str[255] = '\n';
strLen = 256; strLen = 256;
@ -136,7 +157,7 @@ void BlockStatManager::ToFile(const CHAR *filename) {
// //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static const CHAR *kNullBlockString = "NULL_BLOCK_STAT"; static const CHAR *kNullBlockString = "NULL_BLOCK_STAT";
static const uint32 kNullBlockStringLength = strlen(kNullBlockString); static const uint32 kNullBlockStringLength = uint32(strlen(kNullBlockString));
BlockStatManager::BlockStatList::BlockStatList() BlockStatManager::BlockStatList::BlockStatList()
: m_Tail(0) : m_Tail(0)