ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More warnings fixes by riccardom (patch 2157019)

This commit is contained in:
yabause 2008-10-17 09:12:36 +00:00
parent 62ab94aa16
commit 1e9e8c405b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
desmume/src/saves.cpp
View File

@ -228,7 +228,7 @@ SFORMAT SF_MMU[]={
}; };
void mmu_savestate(std::ostream* os) static void mmu_savestate(std::ostream* os)
{ {
//version //version
write32le(0,os); write32le(0,os);
@ -237,7 +237,7 @@ void mmu_savestate(std::ostream* os)
os->write((char*)MMU.bupmem.data,MMU.bupmem.size); os->write((char*)MMU.bupmem.data,MMU.bupmem.size);
} }
bool mmu_loadstate(std::istream* is) static bool mmu_loadstate(std::istream* is)
{ {
//read version //read version
int version; int version;
@ -297,7 +297,7 @@ static void cp15_saveone(armcp15_t *cp15, std::ostream* os)
for(int i=0;i<8;i++) write32le(cp15->regionExecuteSet_SYS[i],os); for(int i=0;i<8;i++) write32le(cp15->regionExecuteSet_SYS[i],os);
} }
void cp15_savestate(std::ostream* os) static void cp15_savestate(std::ostream* os)
{ {
//version //version
write32le(0,os); write32le(0,os);
@ -351,7 +351,7 @@ static bool cp15_loadone(armcp15_t *cp15, std::istream* is)
return true; return true;
} }
bool cp15_loadstate(std::istream* is) static bool cp15_loadstate(std::istream* is)
{ {
//read version //read version
int version; int version;
@ -367,7 +367,7 @@ bool cp15_loadstate(std::istream* is)
/* Format time and convert to string */ /* Format time and convert to string */
char * format_time(time_t cal_time) static char * format_time(time_t cal_time)
{ {
struct tm *time_struct; struct tm *time_struct;
static char string[30]; static char string[30];
@ -530,7 +530,7 @@ static bool ReadStateChunk(std::istream* is, SFORMAT *sf, int size)
//special case: read a huge byte array //special case: read a huge byte array
is->read((char *)tmp->v,count); is->read((char *)tmp->v,count);
} else { } else {
for(int i=0;i<count;i++) for(unsigned int i=0;i<count;i++)
{ {
is->read((char *)tmp->v + i*size,size); is->read((char *)tmp->v + i*size,size);
@ -612,7 +612,6 @@ static int savestate_WriteChunk(std::ostream* os, int type, SFORMAT *sf)
if(!sf) return 4; if(!sf) return 4;
int bsize = SubWrite((std::ostream*)0,sf); int bsize = SubWrite((std::ostream*)0,sf);
write32le(bsize,os); write32le(bsize,os);
FILE* outf;
if(!SubWrite(os,sf)) if(!SubWrite(os,sf))
{ {