backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-19 09:47:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use bool for save file IO results

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-10 10:29:24 +11:00
parent ca942717cb
commit 45c22ab6cc
7 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.World/IO/Files/ConsoleSaveFile.h
View file

@ -11,9 +11,9 @@ public:
virtual FileEntry *createFile( const ConsoleSavePath &fileName ) = 0; virtual FileEntry *createFile( const ConsoleSavePath &fileName ) = 0;
virtual void deleteFile( FileEntry *file ) = 0; virtual void deleteFile( FileEntry *file ) = 0;
virtual void setFilePointer( FileEntry *file,LONG lDistanceToMove, PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod) = 0; virtual void setFilePointer( FileEntry *file,LONG lDistanceToMove, PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod) = 0;
virtual BOOL writeFile( FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) = 0; virtual bool writeFile( FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) = 0;
virtual BOOL zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) = 0; virtual bool zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) = 0;
virtual BOOL readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead ) = 0; virtual bool readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead ) = 0;
virtual bool closeHandle( FileEntry *file ) = 0; virtual bool closeHandle( FileEntry *file ) = 0;
virtual void finalizeWrite() = 0; virtual void finalizeWrite() = 0;
virtual void tick() {}; virtual void tick() {};

14
Minecraft.World/IO/Files/ConsoleSaveFileInputStream.cpp
View file

@ -28,14 +28,14 @@ int ConsoleSaveFileInputStream::read()
uint8_t byteRead = static_cast<uint8_t>(0); uint8_t byteRead = static_cast<uint8_t>(0);
unsigned int numberOfBytesRead; unsigned int numberOfBytesRead;
BOOL result = m_saveFile->readFile( bool result = m_saveFile->readFile(
m_file, m_file,
&byteRead, // data buffer &byteRead, // data buffer
1, // number of bytes to read 1, // number of bytes to read
&numberOfBytesRead // number of bytes read &numberOfBytesRead // number of bytes read
); );
if( result == 0 ) if( !result )
{ {
// TODO 4J Stu - Some kind of error handling // TODO 4J Stu - Some kind of error handling
return -1; return -1;
@ -58,14 +58,14 @@ int ConsoleSaveFileInputStream::read(byteArray b)
{ {
unsigned int numberOfBytesRead; unsigned int numberOfBytesRead;
BOOL result = m_saveFile->readFile( bool result = m_saveFile->readFile(
m_file, m_file,
&b.data, // data buffer &b.data, // data buffer
b.length, // number of bytes to read b.length, // number of bytes to read
&numberOfBytesRead // number of bytes read &numberOfBytesRead // number of bytes read
); );
if( result == 0 ) if( !result )
{ {
// TODO 4J Stu - Some kind of error handling // TODO 4J Stu - Some kind of error handling
return -1; return -1;
@ -94,14 +94,14 @@ int ConsoleSaveFileInputStream::read(byteArray b, unsigned int offset, unsigned
unsigned int numberOfBytesRead; unsigned int numberOfBytesRead;
BOOL result = m_saveFile->readFile( bool result = m_saveFile->readFile(
m_file, m_file,
&b[offset], // data buffer &b[offset], // data buffer
length, // number of bytes to read length, // number of bytes to read
&numberOfBytesRead // number of bytes read &numberOfBytesRead // number of bytes read
); );
if( result == 0 ) if( !result )
{ {
// TODO 4J Stu - Some kind of error handling // TODO 4J Stu - Some kind of error handling
return -1; return -1;
@ -123,7 +123,7 @@ void ConsoleSaveFileInputStream::close()
{ {
bool result = m_saveFile->closeHandle( m_file ); bool result = m_saveFile->closeHandle( m_file );
if( result == 0 ) if( !result )
{ {
// TODO 4J Stu - Some kind of error handling // TODO 4J Stu - Some kind of error handling
} }

18
Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
View file

@ -337,12 +337,12 @@ void ConsoleSaveFileOriginal::PrepareForWrite( FileEntry *file, unsigned int nNu
finalizeWrite(); finalizeWrite();
} }
BOOL ConsoleSaveFileOriginal::writeFile(FileEntry *file,const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) bool ConsoleSaveFileOriginal::writeFile(FileEntry *file,const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
{ {
assert( pvSaveMem != NULL ); assert( pvSaveMem != NULL );
if( pvSaveMem == NULL ) if( pvSaveMem == NULL )
{ {
return 0; return false;
} }
LockSaveAccess(); LockSaveAccess();
@ -371,15 +371,15 @@ BOOL ConsoleSaveFileOriginal::writeFile(FileEntry *file,const void *lpBuffer, un
ReleaseSaveAccess(); ReleaseSaveAccess();
return 1; return true;
} }
BOOL ConsoleSaveFileOriginal::zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) bool ConsoleSaveFileOriginal::zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
{ {
assert( pvSaveMem != NULL ); assert( pvSaveMem != NULL );
if( pvSaveMem == NULL ) if( pvSaveMem == NULL )
{ {
return 0; return false;
} }
LockSaveAccess(); LockSaveAccess();
@ -408,16 +408,16 @@ BOOL ConsoleSaveFileOriginal::zeroFile(FileEntry *file, unsigned int nNumberOfBy
ReleaseSaveAccess(); ReleaseSaveAccess();
return 1; return true;
} }
BOOL ConsoleSaveFileOriginal::readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead) bool ConsoleSaveFileOriginal::readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead)
{ {
unsigned int actualBytesToRead; unsigned int actualBytesToRead;
assert( pvSaveMem != NULL ); assert( pvSaveMem != NULL );
if( pvSaveMem == NULL ) if( pvSaveMem == NULL )
{ {
return 0; return false;
} }
LockSaveAccess(); LockSaveAccess();
@ -448,7 +448,7 @@ BOOL ConsoleSaveFileOriginal::readFile( FileEntry *file, void *lpBuffer, unsigne
ReleaseSaveAccess(); ReleaseSaveAccess();
return 1; return true;
} }
bool ConsoleSaveFileOriginal::closeHandle( FileEntry *file ) bool ConsoleSaveFileOriginal::closeHandle( FileEntry *file )

6
Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h
View file

@ -44,9 +44,9 @@ public:
virtual void deleteFile( FileEntry *file ); virtual void deleteFile( FileEntry *file );
virtual void setFilePointer(FileEntry *file,LONG lDistanceToMove,PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod); virtual void setFilePointer(FileEntry *file,LONG lDistanceToMove,PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod);
virtual BOOL writeFile( FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten ); virtual bool writeFile( FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten );
virtual BOOL zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten); virtual bool zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten);
virtual BOOL readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead ); virtual bool readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead );
virtual bool closeHandle( FileEntry *file ); virtual bool closeHandle( FileEntry *file );
virtual void finalizeWrite(); virtual void finalizeWrite();

14
Minecraft.World/IO/Files/ConsoleSaveFileOutputStream.cpp
View file

@ -40,14 +40,14 @@ void ConsoleSaveFileOutputStream::write(unsigned int b)
uint8_t value = (uint8_t) b; uint8_t value = (uint8_t) b;
BOOL result = m_saveFile->writeFile( bool result = m_saveFile->writeFile(
m_file, m_file,
&value, // data buffer &value, // data buffer
1, // number of bytes to write 1, // number of bytes to write
&numberOfBytesWritten // number of bytes written &numberOfBytesWritten // number of bytes written
); );
if( result == 0 ) if( !result )
{ {
// TODO 4J Stu - Some kind of error handling // TODO 4J Stu - Some kind of error handling
} }
@ -64,14 +64,14 @@ void ConsoleSaveFileOutputStream::write(byteArray b)
{ {
unsigned int numberOfBytesWritten; unsigned int numberOfBytesWritten;
BOOL result = m_saveFile->writeFile( bool result = m_saveFile->writeFile(
m_file, m_file,
&b.data, // data buffer &b.data, // data buffer
b.length, // number of bytes to write b.length, // number of bytes to write
&numberOfBytesWritten // number of bytes written &numberOfBytesWritten // number of bytes written
); );
if( result == 0 ) if( !result )
{ {
// TODO 4J Stu - Some kind of error handling // TODO 4J Stu - Some kind of error handling
} }
@ -93,14 +93,14 @@ void ConsoleSaveFileOutputStream::write(byteArray b, unsigned int offset, unsign
unsigned int numberOfBytesWritten; unsigned int numberOfBytesWritten;
BOOL result = m_saveFile->writeFile( bool result = m_saveFile->writeFile(
m_file, m_file,
&b[offset], // data buffer &b[offset], // data buffer
length, // number of bytes to write length, // number of bytes to write
&numberOfBytesWritten // number of bytes written &numberOfBytesWritten // number of bytes written
); );
if( result == 0 ) if( !result )
{ {
// TODO 4J Stu - Some kind of error handling // TODO 4J Stu - Some kind of error handling
} }
@ -119,7 +119,7 @@ void ConsoleSaveFileOutputStream::close()
{ {
bool result = m_saveFile->closeHandle( m_file ); bool result = m_saveFile->closeHandle( m_file );
if( result == 0 ) if( !result )
{ {
// TODO 4J Stu - Some kind of error handling // TODO 4J Stu - Some kind of error handling
} }

18
Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
View file

@ -734,12 +734,12 @@ void ConsoleSaveFileSplit::PrepareForWrite( FileEntry *file, unsigned int nNumbe
finalizeWrite(); finalizeWrite();
} }
BOOL ConsoleSaveFileSplit::writeFile(FileEntry *file,const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) bool ConsoleSaveFileSplit::writeFile(FileEntry *file,const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
{ {
assert( pvSaveMem != NULL ); assert( pvSaveMem != NULL );
if( pvSaveMem == NULL ) if( pvSaveMem == NULL )
{ {
return 0; return false;
} }
LockSaveAccess(); LockSaveAccess();
@ -784,15 +784,15 @@ BOOL ConsoleSaveFileSplit::writeFile(FileEntry *file,const void *lpBuffer, unsig
ReleaseSaveAccess(); ReleaseSaveAccess();
return 1; return true;
} }
BOOL ConsoleSaveFileSplit::zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) bool ConsoleSaveFileSplit::zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
{ {
assert( pvSaveMem != NULL ); assert( pvSaveMem != NULL );
if( pvSaveMem == NULL ) if( pvSaveMem == NULL )
{ {
return 0; return false;
} }
LockSaveAccess(); LockSaveAccess();
@ -837,16 +837,16 @@ BOOL ConsoleSaveFileSplit::zeroFile(FileEntry *file, unsigned int nNumberOfBytes
ReleaseSaveAccess(); ReleaseSaveAccess();
return 1; return true;
} }
BOOL ConsoleSaveFileSplit::readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead) bool ConsoleSaveFileSplit::readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead)
{ {
unsigned int actualBytesToRead; unsigned int actualBytesToRead;
assert( pvSaveMem != NULL ); assert( pvSaveMem != NULL );
if( pvSaveMem == NULL ) if( pvSaveMem == NULL )
{ {
return 0; return false;
} }
LockSaveAccess(); LockSaveAccess();
@ -889,7 +889,7 @@ BOOL ConsoleSaveFileSplit::readFile( FileEntry *file, void *lpBuffer, unsigned i
ReleaseSaveAccess(); ReleaseSaveAccess();
return 1; return true;
} }
bool ConsoleSaveFileSplit::closeHandle( FileEntry *file ) bool ConsoleSaveFileSplit::closeHandle( FileEntry *file )

6
Minecraft.World/IO/Files/ConsoleSaveFileSplit.h
View file

@ -96,9 +96,9 @@ public:
virtual void deleteFile( FileEntry *file ); virtual void deleteFile( FileEntry *file );
virtual void setFilePointer(FileEntry *file,LONG lDistanceToMove,PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod); virtual void setFilePointer(FileEntry *file,LONG lDistanceToMove,PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod);
virtual BOOL writeFile( FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten ); virtual bool writeFile( FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten );
virtual BOOL zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten); virtual bool zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten);
virtual BOOL readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead ); virtual bool readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead );
virtual bool closeHandle( FileEntry *file ); virtual bool closeHandle( FileEntry *file );
virtual void finalizeWrite(); virtual void finalizeWrite();