piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Final typo and error fixes and include reordering

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@372 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY
2008-08-28 09:19:46 +00:00
parent 531230c03d
commit f8b4311b66
6 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/Common/Src/ChunkFile.cpp
View File

@ -36,8 +36,8 @@ ChunkFile::ChunkFile(const char *filename, ChunkFileMode _mode)
}
fseek(f, 0, SEEK_END);
size = ftell(f);
eof = size;
fsize = ftell(f);
eof = fsize;
stack_ptr = 0;
}
@ -87,7 +87,7 @@ bool ChunkFile::Do(void *ptr, int size)
}
// Do variable size array (probably heap-allocated)
bool DoArray(void *ptr, int size, int arrSize) {
bool ChunkFile::DoArray(void *ptr, int size, int arrSize) {
int sz;
if(ptr == NULL)
@ -102,18 +102,19 @@ bool DoArray(void *ptr, int size, int arrSize) {
if (sz != arrSize)
return false;
for(int i = 0; i < arrSize; i++) {
fread(ptr[i], size, 1, f);
fseek(f, ((size + 3) & ~3) - size, SEEK_CUR);
}
fread(ptr, arrSize * size, 1, f);
fseek(f, (((arrSize * size) + 3) & ~3) - (arrSize * size),
SEEK_CUR);
break;
case MODE_WRITE:
WriteInt(size);
WriteInt(arrSize);
for(int i = 0; i < arrSize; i++) {
fwrite(ptr[i], size, 1, f);
fseek(f, ((size + 3) & ~3) - size, SEEK_CUR);
}
fwrite(ptr, arrSize * size, 1, f);
fseek(f, (((arrSize * size) + 3) & ~3) - (arrSize * size),
SEEK_CUR);
break;
case MODE_VERIFY:
sz = ReadInt();

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

@ -22,8 +22,7 @@
// Grabbed from one of my older projects and modified heavily.
// Works more like a RIFF file than a Google Protocol Buffer, for example.
#include "Common.h"
#include <stdio.h>
#include <map>
#include <vector>
@ -57,7 +56,7 @@ private:
int stack_ptr;
char *data;
int size;
int fsize;
int eof;
ChunkFileMode mode;
@ -88,7 +87,7 @@ public:
// Store maps to file. Very useful.
template<class T>
bool Do(std::map<u32, T> &x) {
bool Do(std::map<unsigned int, T> &x) {
return false;
}
@ -101,8 +100,8 @@ public:
// Disable size checks to save size for variable size array storing
template<class T>
bool DoArray(T *x, int size, int arrSize) {
template<class T>
bool DoArray(T *x, int arrSize) {
return DoArray((void *)x, sizeof(T), arrSize);
}