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

now uses vfs_load instead of vfs_map (faster, doesn't break if the files are in an archive and compressed)

Browse Source 
This was SVN commit r1048.
This commit is contained in:
janwas 2004-08-24 17:26:35 +00:00
parent aba8d1daaa
commit 49e284ae5e
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/ps/XML.h
View File

@ -61,13 +61,13 @@ XMLCh *XMLTranscode(const char *);
*/
class CVFSInputSource: public InputSource
{
Handle m_hFile;
Handle m_hMem; // from vfs_load
void *m_pBuffer;
size_t m_BufferSize;
public:
CVFSInputSource():
m_hFile(0),
m_hMem(0),
m_pBuffer(NULL),
m_BufferSize(0)
{}

26
source/ps/XMLUtils.cpp
View File

@ -9,6 +9,7 @@
#include "posix.h" // ptrdiff_t
#include "res/vfs.h"
#include "res/mem.h"
#define LOG_CATEGORY "xml"
@ -55,22 +56,13 @@ int CVFSInputSource::OpenFile(const char *path)
{
debug_out("CVFSInputSource::OpenFile(): opening file %s.\n", path);
m_hFile=vfs_open(path);
if (m_hFile <= 0)
m_hMem = vfs_load(path, m_pBuffer, m_BufferSize);
if(m_hMem <= 0)
{
LOG(ERROR, LOG_CATEGORY, "CVFSInputSource: file %s couldn't be opened (vfs_open: %lld)", path, m_hFile);
LOG(ERROR, LOG_CATEGORY, "CVFSInputSource: file %s couldn't be loaded (vfs_load: %lld)", path, m_hMem);
return -1;
}
int err;
if ((err=vfs_map(m_hFile, 0, m_pBuffer, m_BufferSize)) != 0)
{
LOG(ERROR, LOG_CATEGORY, "CVFSInputSource: file %s couldn't be opened (vfs_map: %d)", path, err);
vfs_close(m_hFile);
m_hFile=0;
return -1;
}
XMLCh *sysId=XMLString::transcode(path);
setSystemId(sysId);
XMLString::release(&sysId);
@ -90,11 +82,9 @@ void CVFSInputSource::OpenBuffer(const char* path, const void* buffer, const siz
CVFSInputSource::~CVFSInputSource()
{
if (m_hFile > 0)
{
vfs_unmap(m_hFile);
vfs_close(m_hFile);
}
// our buffer was vfs_load-ed; free it now
if(m_hMem > 0)
mem_free_h(m_hMem);
}
BinInputStream *CVFSInputSource::makeStream() const