piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Very tiny cleanup of ChunkFile.h."

Browse Source 
int/size_t change without updating the rev# caused crash on Dolphin start

This reverts commit cf942450e0.
This commit is contained in:
Jordan Woyak 2013-01-10 17:39:07 -06:00
parent 240ea0f116
commit 51a1d4cde7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Common/Src/ChunkFile.h
View File

@ -63,13 +63,13 @@ public:
Mode GetMode() const {return mode;} Mode GetMode() const {return mode;}
u8 **GetPPtr() {return ptr;} u8 **GetPPtr() {return ptr;}
void DoVoid(void *data, size_t size) void DoVoid(void *data, int size)
{ {
switch (mode) { switch (mode) {
case MODE_READ: memcpy(data, *ptr, size); break; case MODE_READ: memcpy(data, *ptr, size); break;
case MODE_WRITE: memcpy(*ptr, data, size); break; case MODE_WRITE: memcpy(*ptr, data, size); break;
case MODE_MEASURE: break; // MODE_MEASURE - don't need to do anything case MODE_MEASURE: break; // MODE_MEASURE - don't need to do anything
case MODE_VERIFY: for(size_t i = 0; i < size; i++) _dbg_assert_msg_(COMMON, ((u8*)data)[i] == (*ptr)[i], "Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n", ((u8*)data)[i], ((u8*)data)[i], &((u8*)data)[i], (*ptr)[i], (*ptr)[i], &(*ptr)[i]); break; case MODE_VERIFY: for(int i = 0; i < size; i++) _dbg_assert_msg_(COMMON, ((u8*)data)[i] == (*ptr)[i], "Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n", ((u8*)data)[i], ((u8*)data)[i], &((u8*)data)[i], (*ptr)[i], (*ptr)[i], &(*ptr)[i]); break;
default: break; // throw an error? default: break; // throw an error?
} }
(*ptr) += size; (*ptr) += size;
@ -78,7 +78,7 @@ public:
template<class T> template<class T>
void Do(std::map<unsigned int, T> &x) void Do(std::map<unsigned int, T> &x)
{ {
size_t number = x.size(); unsigned int number = (unsigned int)x.size();
Do(number); Do(number);
switch (mode) { switch (mode) {
case MODE_READ: case MODE_READ:
@ -126,17 +126,18 @@ public:
template<class T> template<class T>
void Do(std::deque<T> &x) void Do(std::deque<T> &x)
{ {
size_t deq_size = x.size(); u32 deq_size = (u32)x.size();
Do(deq_size); Do(deq_size);
x.resize(deq_size); x.resize(deq_size);
for(size_t i = 0; i < deq_size; i++) u32 i;
for(i = 0; i < deq_size; i++)
DoVoid(&x[i],sizeof(T)); DoVoid(&x[i],sizeof(T));
} }
// Store strings. // Store strings.
void Do(std::string &x) void Do(std::string &x)
{ {
size_t stringLen = (x.length() + 1); int stringLen = (int)x.length() + 1;
Do(stringLen); Do(stringLen);
switch (mode) { switch (mode) {
@ -150,7 +151,7 @@ public:
void Do(std::wstring &x) void Do(std::wstring &x)
{ {
size_t stringLen = sizeof(wchar_t)*(x.length() + 1); int stringLen = sizeof(wchar_t)*((int)x.length() + 1);
Do(stringLen); Do(stringLen);
switch (mode) { switch (mode) {
@ -163,7 +164,7 @@ public:
} }
template<class T> template<class T>
void DoArray(T *x, size_t count) { void DoArray(T *x, int count) {
DoVoid((void *)x, sizeof(T) * count); DoVoid((void *)x, sizeof(T) * count);
} }