phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Adjusted error handling minorly

Browse Source 
This was SVN commit r1073.
This commit is contained in:
Ykkrosh 2004-08-27 21:14:23 +00:00
parent 5054cf00cd
commit 9280aa15a7
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/ps/CVFSFile.cpp
View File

@ -12,17 +12,18 @@ CVFSFile::CVFSFile() : m_Handle(0) {}
CVFSFile::~CVFSFile()
{
// I hope this is the right way to delete the handle returned by
// vfs_load... C++ destructors would be far less ambiguous ;-)
if (m_Handle)
mem_free_h(m_Handle);
}
PSRETURN CVFSFile::Load(const char* filename, uint flags /* default 0 */)
PSRETURN CVFSFile::Load(const char* filename, uint flags /* = 0 */)
{
assert(!m_Handle && "Mustn't open files twice");
if (m_Handle)
throw PSERROR_CVFSFile_AlreadyLoaded();
{
// Load should never be called more than once, so complain
debug_warn("Mustn't open files twice");
return PSRETURN_CVFSFile_AlreadyLoaded;
}
m_Handle = vfs_load(filename, m_Buffer, m_BufferSize, flags);
if (m_Handle <= 0)
@ -36,7 +37,7 @@ PSRETURN CVFSFile::Load(const char* filename, uint flags /* default 0 */)
const void* CVFSFile::GetBuffer() const
{
// Die in a very obvious way, to avoid problems caused by
// Die in a very obvious way, to avoid subtle problems caused by
// accidentally forgetting to check that the open succeeded
if (!m_Handle)
{
@ -54,13 +55,5 @@ const size_t CVFSFile::GetBufferSize() const
CStr CVFSFile::GetAsString() const
{
// Die in a very obvious way, to avoid subtle problems caused by
// accidentally forgetting to check that the open succeeded
if (!m_Handle)
{
debug_warn("GetBuffer() called with no file loaded");
throw PSERROR_CVFSFile_InvalidBufferAccess();
}
return std::string((char*)m_Buffer, m_BufferSize);
return std::string((char*)GetBuffer(), GetBufferSize());
}