actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CString -> RString for files used by smpackage

Browse Source
This commit is contained in:
Chris Danford
2005-12-10 08:15:44 +00:00
parent 09d8307a83
commit ec51af900e
19 changed files with 310 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileDriverZip.cpp
+17 -12
View File
@@ -15,7 +15,7 @@
static struct FileDriverEntry_ZIP: public FileDriverEntry
{
FileDriverEntry_ZIP(): FileDriverEntry( "ZIP" ) { }
RageFileDriver *Create( CString Root ) const { return new RageFileDriverZip( Root ); }
RageFileDriver *Create( RString Root ) const { return new RageFileDriverZip( Root ); }
} const g_RegisterDriver;
@@ -27,7 +27,7 @@ RageFileDriverZip::RageFileDriverZip():
m_pZip = NULL;
}
RageFileDriverZip::RageFileDriverZip( CString sPath ):
RageFileDriverZip::RageFileDriverZip( RString sPath ):
RageFileDriver( new NullFilenameDB ),
m_Mutex( "RageFileDriverZip" )
{
@@ -46,7 +46,7 @@ RageFileDriverZip::RageFileDriverZip( RageFileBasic *pFile ):
Load( pFile );
}
bool RageFileDriverZip::Load( const CString &sPath )
bool RageFileDriverZip::Load( const RString &sPath )
{
ASSERT( m_pZip == NULL ); /* don't load twice */
@@ -82,8 +82,8 @@ bool RageFileDriverZip::Load( RageFileBasic *pFile )
bool RageFileDriverZip::ReadEndCentralRecord( int &iTotalEntries, int &iCentralDirectoryOffset )
{
CString sError;
CString sSig = FileReading::ReadString( *m_pZip, 4, sError );
RString sError;
RString sSig = FileReading::ReadString( *m_pZip, 4, sError );
FileReading::read_16_le( *m_pZip, sError ); /* skip number of this disk */
FileReading::read_16_le( *m_pZip, sError ); /* skip disk with central directory */
FileReading::read_16_le( *m_pZip, sError ); /* skip number of entries on this disk */
@@ -176,8 +176,8 @@ bool RageFileDriverZip::ParseZipfile()
int RageFileDriverZip::ProcessCdirFileHdr( FileInfo &info )
{
CString sError;
CString sSig = FileReading::ReadString( *m_pZip, 4, sError );
RString sError;
RString sSig = FileReading::ReadString( *m_pZip, 4, sError );
if( sSig != "\x50\x4B\x01\x02" )
{
LOG->Warn( "%s: central directory record signature not found", m_sPath.c_str() );
@@ -256,8 +256,8 @@ bool RageFileDriverZip::ReadLocalFileHeader( FileInfo &info )
/* Seek to and read the local file header. */
m_pZip->Seek( info.m_iOffset );
CString sError;
CString sSig = FileReading::ReadString( *m_pZip, 4, sError );
RString sError;
RString sSig = FileReading::ReadString( *m_pZip, 4, sError );
if( sError != "" )
{
@@ -295,12 +295,12 @@ RageFileDriverZip::~RageFileDriverZip()
delete m_pZip;
}
const RageFileDriverZip::FileInfo *RageFileDriverZip::GetFileInfo( const CString &sPath ) const
const RageFileDriverZip::FileInfo *RageFileDriverZip::GetFileInfo( const RString &sPath ) const
{
return (const FileInfo *) FDB->GetFilePriv( sPath );
}
RageFileBasic *RageFileDriverZip::Open( const CString &sPath, int iMode, int &iErr )
RageFileBasic *RageFileDriverZip::Open( const RString &sPath, int iMode, int &iErr )
{
if( iMode & RageFile::WRITE )
{
@@ -352,11 +352,16 @@ RageFileBasic *RageFileDriverZip::Open( const CString &sPath, int iMode, int &iE
}
/* NOP for now. This could check to see if the ZIP's mtime has changed, and reload. */
void RageFileDriverZip::FlushDirCache( const CString &sPath )
void RageFileDriverZip::FlushDirCache( const RString &sPath )
{
}
RString RageFileDriverZip::GetGlobalComment() const
{
ASSERT(0);
}
/*
* Copyright (c) 2003-2005 Glenn Maynard. All rights reserved.
* All rights reserved.