haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

start using FILE_LINE_READER( const wxString& )

This commit is contained in:
Dick Hollenbeck 2012-11-27 08:14:15 -06:00
parent 98086a8891
commit 9ae4e60911
3 changed files with 10 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/kicad_plugin.cpp
View File

@ -222,16 +222,8 @@ void FP_CACHE::Load()
do do
{ {
FILE* fp = wxFopen( fpFileName, wxT( "r" ) );
if( !fp )
{
THROW_IO_ERROR( wxString::Format( _( "cannot open footprint library file '%s'" ),
fpFileName.GetData() ) );
}
// reader now owns fp, will close on exception or return // reader now owns fp, will close on exception or return
FILE_LINE_READER reader( fp, fpFileName ); FILE_LINE_READER reader( fpFileName );
m_owner->m_parser->SetLineReader( &reader ); m_owner->m_parser->SetLineReader( &reader );
@ -1551,15 +1543,7 @@ PCB_IO::~PCB_IO()
BOARD* PCB_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, PROPERTIES* aProperties ) BOARD* PCB_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, PROPERTIES* aProperties )
{ {
wxFFile file( aFileName, wxT("r") ); FILE_LINE_READER reader( aFileName );
if( !file.IsOpened() )
{
wxString msg = wxString::Format( _( "Unable to read file \"%s\"" ), GetChars( aFileName ) );
THROW_IO_ERROR( msg );
}
FILE_LINE_READER reader( file.fp(), aFileName, false /* wxFFile owns fp */ );
m_parser->SetLineReader( &reader ); m_parser->SetLineReader( &reader );
m_parser->SetBoard( aAppendToMe ); m_parser->SetBoard( aAppendToMe );

20
pcbnew/legacy_plugin.cpp
View File

@ -238,15 +238,7 @@ BOARD* LEGACY_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, PROPE
// delete on exception, iff I own m_board, according to aAppendToMe // delete on exception, iff I own m_board, according to aAppendToMe
auto_ptr<BOARD> deleter( aAppendToMe ? NULL : m_board ); auto_ptr<BOARD> deleter( aAppendToMe ? NULL : m_board );
FILE* fp = wxFopen( aFileName, wxT( "r" ) ); FILE_LINE_READER reader( aFileName );
if( !fp )
{
m_error.Printf( _( "Unable to open file '%s'" ), aFileName.GetData() );
THROW_IO_ERROR( m_error );
}
// reader now owns fp, will close on exception or return
FILE_LINE_READER reader( fp, aFileName );
m_reader = &reader; // member function accessibility m_reader = &reader; // member function accessibility
@ -3920,15 +3912,7 @@ wxDateTime FPL_CACHE::GetLibModificationTime()
void FPL_CACHE::Load() void FPL_CACHE::Load()
{ {
FILE* fp = wxFopen( m_lib_name, wxT( "r" ) ); FILE_LINE_READER reader( m_lib_name );
if( !fp )
{
THROW_IO_ERROR( wxString::Format(
_( "Unable to open legacy library file '%s'" ), m_lib_name.GetData() ) );
}
// reader now owns fp, will close on exception or return
FILE_LINE_READER reader( fp, m_lib_name );
ReadAndVerifyHeader( &reader ); ReadAndVerifyHeader( &reader );
SkipIndex( &reader ); SkipIndex( &reader );

23
pcbnew/specctra.cpp
View File

@ -230,14 +230,9 @@ void SPECCTRA_DB::readTIME( time_t* time_stamp ) throw( IO_ERROR )
void SPECCTRA_DB::LoadPCB( const wxString& filename ) throw( IO_ERROR ) void SPECCTRA_DB::LoadPCB( const wxString& filename ) throw( IO_ERROR )
{ {
FILE* fp = wxFopen( filename, wxT("r") ); FILE_LINE_READER reader( filename );
if( !fp ) PushReader( &reader );
{
ThrowIOError( _("Unable to open file \"%s\""), GetChars(filename) );
}
PushReader( new FILE_LINE_READER( fp, filename ) );
if( NextTok() != T_LEFT ) if( NextTok() != T_LEFT )
Expecting( T_LEFT ); Expecting( T_LEFT );
@ -248,21 +243,15 @@ void SPECCTRA_DB::LoadPCB( const wxString& filename ) throw( IO_ERROR )
SetPCB( new PCB() ); SetPCB( new PCB() );
doPCB( pcb ); doPCB( pcb );
PopReader();
delete PopReader(); // close fp
} }
void SPECCTRA_DB::LoadSESSION( const wxString& filename ) throw( IO_ERROR ) void SPECCTRA_DB::LoadSESSION( const wxString& filename ) throw( IO_ERROR )
{ {
FILE* fp = wxFopen( filename, wxT("r") ); FILE_LINE_READER reader( filename );
if( !fp ) PushReader( &reader );
{
ThrowIOError( _("Unable to open file \"%s\""), GetChars(filename) );
}
PushReader( new FILE_LINE_READER( fp, filename ) );
if( NextTok() != T_LEFT ) if( NextTok() != T_LEFT )
Expecting( T_LEFT ); Expecting( T_LEFT );
@ -274,7 +263,7 @@ void SPECCTRA_DB::LoadSESSION( const wxString& filename ) throw( IO_ERROR )
doSESSION( session ); doSESSION( session );
delete PopReader(); // close fp PopReader();
} }