Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

turn stringFromStream into macro to aid logging for leak detection. Debug builds only effected.

Browse source
This commit is contained in:
ehouse 2007-03-18 23:31:51 +00:00
parent 1ad222c409
commit 6dc75914a6
7 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/dictnry.c
View file

@ -333,7 +333,7 @@ dict_loadFromStream( DictionaryCtxt* dict, XWStreamCtxt* stream )
for ( nSpecials = i = 0; i < nFaces; ++i ) { for ( nSpecials = i = 0; i < nFaces; ++i ) {
XP_UCHAR face = dict_getTileChar( dict, (Tile)i ); XP_UCHAR face = dict_getTileChar( dict, (Tile)i );
if ( IS_SPECIAL( face ) ) { if ( IS_SPECIAL( face ) ) {
XP_UCHAR* txt = stringFromStream( MPPARM(dict->mpool) stream ); XP_UCHAR* txt = stringFromStream( dict->mpool, stream );
XP_ASSERT( !!txt ); XP_ASSERT( !!txt );
localTexts[nSpecials] = txt; localTexts[nSpecials] = txt;

6
common/game.c
View file

@ -367,7 +367,7 @@ gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi )
XP_UCHAR* str; XP_UCHAR* str;
XP_U16 strVersion = stream_getVersion( stream ); XP_U16 strVersion = stream_getVersion( stream );
str = stringFromStream( MPPARM(mpool) stream ); str = stringFromStream( mpool, stream );
replaceStringIfDifferent( mpool, &gi->dictName, str ); replaceStringIfDifferent( mpool, &gi->dictName, str );
if ( !!str ) { if ( !!str ) {
XP_FREE( mpool, str ); XP_FREE( mpool, str );
@ -395,13 +395,13 @@ gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi )
} }
for ( pl = gi->players, i = 0; i < gi->nPlayers; ++pl, ++i ) { for ( pl = gi->players, i = 0; i < gi->nPlayers; ++pl, ++i ) {
str = stringFromStream( MPPARM(mpool) stream ); str = stringFromStream( mpool, stream );
replaceStringIfDifferent( mpool, &pl->name, str ); replaceStringIfDifferent( mpool, &pl->name, str );
if ( !!str ) { if ( !!str ) {
XP_FREE( mpool, str ); XP_FREE( mpool, str );
} }
str = stringFromStream( MPPARM(mpool) stream ); str = stringFromStream( mpool, stream );
replaceStringIfDifferent( mpool, &pl->password, str ); replaceStringIfDifferent( mpool, &pl->password, str );
if ( !!str ) { if ( !!str ) {
XP_FREE( mpool, str ); XP_FREE( mpool, str );

2
common/server.c
View file

@ -1152,7 +1152,7 @@ bwiFromStream( MPFORMAL XWStreamCtxt* stream, BadWordInfo* bwi )
bwi->nWords = nWords; bwi->nWords = nWords;
for ( sp = bwi->words; nWords; ++sp, --nWords ) { for ( sp = bwi->words; nWords; ++sp, --nWords ) {
*sp = stringFromStream( MPPARM(mpool) stream ); *sp = stringFromStream( mpool, stream );
} }
} /* bwiFromStream */ } /* bwiFromStream */

12
common/strutils.c
View file

@ -98,14 +98,22 @@ signedFromStream( XWStreamCtxt* stream, XP_U16 nBits )
#endif #endif
XP_UCHAR* XP_UCHAR*
stringFromStream( MPFORMAL XWStreamCtxt* stream ) p_stringFromStream( MPFORMAL XWStreamCtxt* stream
#ifdef MEM_DEBUG
, const char* file, XP_U32 lineNo
#endif
)
{ {
XP_UCHAR buf[0xFF]; XP_UCHAR buf[0xFF];
XP_UCHAR* str = (XP_UCHAR*)NULL; XP_UCHAR* str = (XP_UCHAR*)NULL;
XP_U16 len = stringFromStreamHere( stream, buf, sizeof(buf) ); XP_U16 len = stringFromStreamHere( stream, buf, sizeof(buf) );
if ( len > 0 ) { if ( len > 0 ) {
str = (XP_UCHAR*)XP_MALLOC( mpool, len + 1 ); #ifdef MEM_DEBUG
str = mpool_alloc( mpool, len + 1, file, lineNo );
#else
str = (XP_UCHAR*)XP_MALLOC( mpool, len + 1 ); /* leaked */
#endif
XP_MEMCPY( str, buf, len + 1 ); XP_MEMCPY( str, buf, len + 1 );
} }
return str; return str;

12
common/strutils.h
View file

@ -37,7 +37,17 @@ void traySetFromStream( XWStreamCtxt* stream, TrayTileSet* ts );
XP_S32 signedFromStream( XWStreamCtxt* stream, XP_U16 nBits ); XP_S32 signedFromStream( XWStreamCtxt* stream, XP_U16 nBits );
void signedToStream( XWStreamCtxt* stream, XP_U16 nBits, XP_S32 num ); void signedToStream( XWStreamCtxt* stream, XP_U16 nBits, XP_S32 num );
XP_UCHAR* stringFromStream( MPFORMAL XWStreamCtxt* stream ); XP_UCHAR* p_stringFromStream( MPFORMAL XWStreamCtxt* stream
#ifdef MEM_DEBUG
, const char* file, XP_U32 lineNo
#endif
);
#ifdef MEM_DEBUG
# define stringFromStream( p, in ) p_stringFromStream( (p), (in), __FILE__, __LINE__ )
#else
# define stringFromStream( p, in ) p_stringFromStream( in )
#endif
XP_U16 stringFromStreamHere( XWStreamCtxt* stream, XP_UCHAR* buf, XP_U16 len ); XP_U16 stringFromStreamHere( XWStreamCtxt* stream, XP_UCHAR* buf, XP_U16 len );
void stringToStream( XWStreamCtxt* stream, const XP_UCHAR* str ); void stringToStream( XWStreamCtxt* stream, const XP_UCHAR* str );

3
palm/palmmain.c
View file

@ -581,8 +581,7 @@ loadCurrentGame( PalmAppGlobals* globals, XP_U16 gIndex,
hasDict = stream_getU8( recStream ); hasDict = stream_getU8( recStream );
if ( hasDict ) { if ( hasDict ) {
XP_UCHAR* name = stringFromStream( MPPARM(globals->mpool) XP_UCHAR* name = stringFromStream( globals->mpool, recStream );
recStream );
dict = palm_dictionary_make( MPPARM(globals->mpool) globals, dict = palm_dictionary_make( MPPARM(globals->mpool) globals,
name, globals->dictList ); name, globals->dictList );
success = dict != NULL; success = dict != NULL;

3
wince/cemain.c
View file

@ -955,8 +955,7 @@ ceLoadSavedGame( CEAppGlobals* globals )
#ifdef STUBBED_DICT #ifdef STUBBED_DICT
XP_ASSERT(0); /* just don't do this!!!! */ XP_ASSERT(0); /* just don't do this!!!! */
#else #else
XP_UCHAR* name = stringFromStream( MPPARM(globals->mpool) XP_UCHAR* name = stringFromStream( globals->mpool, stream );
stream );
dict = ce_dictionary_make( globals, name ); dict = ce_dictionary_make( globals, name );
XP_FREE( globals->mpool, name ); XP_FREE( globals->mpool, name );
success = dict != NULL; success = dict != NULL;