Skip to content

Commit d97d40a

Browse files
committed
Never call gdxErrorStr with nil/nullptr/NULL as first arg
1 parent ea61043 commit d97d40a

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/tools/gdxmerge/gdxmerge.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void SymbolList_t::AddPGXFile( const int FNr, const ProcessPass_t Pass )
189189
gdxOpenRead( PGX, FileName.data(), &ErrNr );
190190
if( ErrNr != 0 )
191191
{
192-
gdxErrorStr( nullptr, ErrNr, ErrMsg.data() );
192+
gdxErrorStr( PGX, ErrNr, ErrMsg.data() );
193193
library::printErrorMessage( "\nError reading file, message: " + ErrMsg );
194194
return;
195195
}
@@ -335,7 +335,7 @@ bool SymbolList_t::CollectBigOne( const int SyNr )
335335
gdxOpenRead( PGX, FileName.data(), &ErrNr );
336336
if( ErrNr != 0 )
337337
{
338-
gdxErrorStr( nullptr, ErrNr, ErrMsg.data() );
338+
gdxErrorStr( PGX, ErrNr, ErrMsg.data() );
339339
library::printErrorMessage( "Error reading file, message: " + ErrMsg );
340340
return false;
341341
}
@@ -799,7 +799,7 @@ int main( const int argc, const char *argv[] )
799799
if( ErrNr != 0 )
800800
{
801801
library::printErrorMessage( "*** Error : Cannot write to output file, Error Nr = " + std::to_string( ErrNr ) );
802-
gdxErrorStr( nullptr, ErrNr, Msg.data() );
802+
gdxErrorStr( PGXMerge, ErrNr, Msg.data() );
803803
library::printErrorMessage( "*** Message: " + Msg );
804804
return 1;
805805
}

0 commit comments

Comments
 (0)