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

remove unused init-by-filename code path

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-20 01:42:57 +00:00
parent 57d9817c5c
commit ab723147bd
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CryptHelpers.cpp
+1 -20
View File
@@ -11,12 +11,6 @@ RageFileStore::ReadErr::ReadErr( const RageFileBasic &f ):
{ {
} }
RageFileStore::RageFileStore()
{
m_pFile = NULL;
m_waiting = false;
}
RageFileStore::RageFileStore( RageFileBasic *pFile ) RageFileStore::RageFileStore( RageFileBasic *pFile )
{ {
m_pFile = pFile; m_pFile = pFile;
@@ -44,20 +38,7 @@ RageFileStore::RageFileStore( const RageFileStore &cpy ):
void RageFileStore::StoreInitialize(const NameValuePairs &parameters) void RageFileStore::StoreInitialize(const NameValuePairs &parameters)
{ {
const char *fileName; ASSERT( m_pFile != NULL );
if( parameters.GetValue("InputFileName", fileName) )
{
RageFile *pFile = new RageFile;
m_pFile = pFile;
LOG->Trace( "XXX: not using pFile" );
if( !pFile->Open(fileName, RageFile::READ) )
throw OpenErr( fileName );
}
else
{
ASSERT( m_pFile != NULL );
LOG->Trace( "XXX: using pFile" );
}
m_waiting = false; m_waiting = false;
} }
stepmania/src/CryptHelpers.h
-3
View File
@@ -20,7 +20,6 @@ public:
class OpenErr : public Err {public: OpenErr(const std::string &filename) : Err("FileStore: error opening file for reading: " + filename) {}}; class OpenErr : public Err {public: OpenErr(const std::string &filename) : Err("FileStore: error opening file for reading: " + filename) {}};
struct ReadErr : public Err { ReadErr( const RageFileBasic &f ); }; struct ReadErr : public Err { ReadErr( const RageFileBasic &f ); };
RageFileStore();
RageFileStore( RageFileBasic *pFile ); /* pFile will be deleted */ RageFileStore( RageFileBasic *pFile ); /* pFile will be deleted */
~RageFileStore(); ~RageFileStore();
RageFileStore( const RageFileStore &cpy ); RageFileStore( const RageFileStore &cpy );
@@ -49,8 +48,6 @@ public:
RageFileSource( RageFileBasic *pFile, bool pumpAll, BufferedTransformation *attachment = NULL, bool binary=true ) RageFileSource( RageFileBasic *pFile, bool pumpAll, BufferedTransformation *attachment = NULL, bool binary=true )
: SourceTemplate<RageFileStore>(attachment,RageFileStore(pFile)) {SourceInitialize(pumpAll, MakeParameters("InputBinaryMode", binary));} : SourceTemplate<RageFileStore>(attachment,RageFileStore(pFile)) {SourceInitialize(pumpAll, MakeParameters("InputBinaryMode", binary));}
RageFileSource(const char *filename, bool pumpAll, BufferedTransformation *attachment = NULL, bool binary=true)
: SourceTemplate<RageFileStore>(attachment) {SourceInitialize(pumpAll, MakeParameters("InputFileName", filename)("InputBinaryMode", binary));}
}; };
#endif #endif