isledecomp/SIEdit
1
0
Fork 0
mirror of https://github.com/isledecomp/SIEdit.git synced 2025-02-17 00:40:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: use void * in utility read/write functions

Browse source 
Easier to write since you don't have to cast to char * all the time
This commit is contained in:
itsmattkc 2022-07-21 17:05:50 -07:00
parent 8d5d9222ce
commit 85e786924d
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/file.cpp
View file

@ -95,66 +95,66 @@ void File::Close()
m_Stream.close();
}
size_t File::ReadData(char *data, size_t size)
size_t File::ReadData(void *data, size_t size)
{
size_t before = this->pos();
m_Stream.read(data, size);
m_Stream.read((char *) data, size);
return this->pos() - before;
}
size_t File::WriteData(const char *data, size_t size)
size_t File::WriteData(const void *data, size_t size)
{
size_t before = this->pos();
m_Stream.write(data, size);
m_Stream.write((const char *) data, size);
return this->pos() - before;
}
uint8_t FileBase::ReadU8()
{
uint8_t u;
ReadData((char *) &u, sizeof(u));
ReadData(&u, sizeof(u));
return u;
}
void FileBase::WriteU8(uint8_t u)
{
WriteData((const char *) &u, sizeof(u));
WriteData(&u, sizeof(u));
}
uint16_t FileBase::ReadU16()
{
uint16_t u;
ReadData((char *) &u, sizeof(u));
ReadData(&u, sizeof(u));
return u;
}
void FileBase::WriteU16(uint16_t u)
{
WriteData((const char *) &u, sizeof(u));
WriteData(&u, sizeof(u));
}
uint32_t FileBase::ReadU32()
{
uint32_t u;
ReadData((char *) &u, sizeof(u));
ReadData(&u, sizeof(u));
return u;
}
void FileBase::WriteU32(uint32_t u)
{
WriteData((const char *) &u, sizeof(u));
WriteData(&u, sizeof(u));
}
Vector3 FileBase::ReadVector3()
{
Vector3 u;
ReadData((char *) &u, sizeof(u));
ReadData(&u, sizeof(u));
return u;
}
void FileBase::WriteVector3(const Vector3 &v)
{
WriteData((const char *) &v, sizeof(v));
WriteData(&v, sizeof(v));
}
std::string FileBase::ReadString()
@ -237,7 +237,7 @@ bool MemoryBuffer::atEnd()
return m_Position == m_Internal.size();
}
size_t MemoryBuffer::ReadData(char *data, size_t size)
size_t MemoryBuffer::ReadData(void *data, size_t size)
{
size = std::min(size, m_Internal.size() - m_Position);
memcpy(data, m_Internal.data() + m_Position, size);
@ -245,7 +245,7 @@ size_t MemoryBuffer::ReadData(char *data, size_t size)
return size;
}
size_t MemoryBuffer::WriteData(const char *data, size_t size)
size_t MemoryBuffer::WriteData(const void *data, size_t size)
{
size_t end = m_Position + size;
if (end > m_Internal.size()) {

12
lib/file.h
View file

@ -29,7 +29,7 @@ public:
std::string ReadString();
bytearray ReadBytes(size_t size);
Vector3 ReadVector3();
virtual size_t ReadData(char *data, size_t size) = 0;
virtual size_t ReadData(void *data, size_t size) = 0;
void WriteU8(uint8_t u);
void WriteU16(uint16_t u);
@ -37,7 +37,7 @@ public:
void WriteString(const std::string &s);
void WriteBytes(const bytearray &b);
void WriteVector3(const Vector3 &b);
virtual size_t WriteData(const char *data, size_t size) = 0;
virtual size_t WriteData(const void *data, size_t size) = 0;
virtual void Close() {}
@ -75,8 +75,8 @@ public:
virtual bool atEnd();
virtual void Close();
virtual size_t ReadData(char *data, size_t size);
virtual size_t WriteData(const char *data, size_t size);
virtual size_t ReadData(void *data, size_t size);
virtual size_t WriteData(const void *data, size_t size);
private:
std::fstream m_Stream;
@ -97,8 +97,8 @@ public:
const bytearray &data() const { return m_Internal; }
virtual size_t ReadData(char *data, size_t size);
virtual size_t WriteData(const char *data, size_t size);
virtual size_t ReadData(void *data, size_t size);
virtual size_t WriteData(const void *data, size_t size);
private:
bytearray m_Internal;