mem alloc take 2

This commit is contained in:
dborth 2008-09-27 07:57:03 +00:00
parent 264dda0965
commit 7ebc1432c0
4 changed files with 3 additions and 15 deletions

View File

@ -223,8 +223,6 @@ LoadBufferFromFAT (char *filepath, bool silent)
int boffset = 0; int boffset = 0;
int read = 0; int read = 0;
AllocSaveBuffer ();
handle = fopen (filepath, "rb"); handle = fopen (filepath, "rb");
if (handle <= 0) if (handle <= 0)
@ -246,8 +244,6 @@ LoadBufferFromFAT (char *filepath, bool silent)
fclose (handle); fclose (handle);
FreeSaveBuffer ();
return boffset; return boffset;
} }
@ -259,8 +255,6 @@ SaveBufferToFAT (char *filepath, int datasize, bool silent)
{ {
FILE *handle; FILE *handle;
AllocSaveBuffer ();
if (datasize) if (datasize)
{ {
handle = fopen (filepath, "wb"); handle = fopen (filepath, "wb");
@ -276,7 +270,5 @@ SaveBufferToFAT (char *filepath, int datasize, bool silent)
fwrite (savebuffer, 1, datasize, handle); fwrite (savebuffer, 1, datasize, handle);
fclose (handle); fclose (handle);
} }
FreeSaveBuffer ();
return datasize; return datasize;
} }

View File

@ -80,6 +80,8 @@ FreeSaveBuffer ()
{ {
if (savebuffer != NULL) if (savebuffer != NULL)
free(savebuffer); free(savebuffer);
savebuffer = NULL;
} }
/**************************************************************************** /****************************************************************************

View File

@ -246,8 +246,6 @@ SaveBufferToSMB (char *filepath, int datasize, bool silent)
int wrote = 0; int wrote = 0;
int boffset = 0; int boffset = 0;
AllocSaveBuffer();
smbfile = smbfile =
SMB_OpenFile (SMBPath(filepath), SMB_OPEN_WRITING | SMB_DENY_NONE, SMB_OpenFile (SMBPath(filepath), SMB_OPEN_WRITING | SMB_DENY_NONE,
SMB_OF_CREATE | SMB_OF_TRUNCATE, smbconn); SMB_OF_CREATE | SMB_OF_TRUNCATE, smbconn);
@ -275,8 +273,6 @@ SaveBufferToSMB (char *filepath, int datasize, bool silent)
WaitPrompt (msg); WaitPrompt (msg);
} }
FreeSaveBuffer();
return boffset; return boffset;
} }
@ -288,9 +284,7 @@ SaveBufferToSMB (char *filepath, int datasize, bool silent)
int int
LoadBufferFromSMB (char *filepath, bool silent) LoadBufferFromSMB (char *filepath, bool silent)
{ {
AllocSaveBuffer();
int result = LoadBufferFromSMB((char *)savebuffer, filepath, silent); int result = LoadBufferFromSMB((char *)savebuffer, filepath, silent);
FreeSaveBuffer();
return result; return result;
} }

View File

@ -152,7 +152,7 @@ LoadSRAM (int method, bool silent)
char filepath[1024]; char filepath[1024];
int offset = 0; int offset = 0;
AllocSaveBuffer (); AllocSaveBuffer();
if(method == METHOD_SD || method == METHOD_USB) if(method == METHOD_SD || method == METHOD_USB)
{ {