Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-11 08:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

use mem_stream_make_raw() where possible in common code

Browse source
This commit is contained in:
Eric House 2018-06-27 23:42:50 -07:00
parent d70b089835
commit d46a4d13ba
5 changed files with 19 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/common/board.c
View file

@ -1090,9 +1090,8 @@ board_commitTurn( BoardCtxt* board, XP_Bool phoniesConfirmed,
XP_MEMSET( &bwl, 0, sizeof(bwl) ); XP_MEMSET( &bwl, 0, sizeof(bwl) );
if ( !legal ) { if ( !legal ) {
stream = mem_stream_make( MPPARM(board->mpool) stream = mem_stream_make_raw( MPPARM(board->mpool)
util_getVTManager(board->util), NULL, util_getVTManager(board->util) );
CHANNEL_NONE, (MemStreamCloseCallback)NULL );
const XP_UCHAR* str = util_getUserString(board->util, const XP_UCHAR* str = util_getUserString(board->util,
STR_COMMIT_CONFIRM); STR_COMMIT_CONFIRM);
@ -1319,10 +1318,8 @@ timerFiredForPen( BoardCtxt* board )
NULL, NULL, NULL ); NULL, NULL, NULL );
if ( listWords ) { if ( listWords ) {
XWStreamCtxt* stream = XWStreamCtxt* stream =
mem_stream_make( MPPARM(board->mpool) mem_stream_make_raw( MPPARM(board->mpool)
util_getVTManager(board->util), NULL, util_getVTManager(board->util) );
CHANNEL_NONE,
(MemStreamCloseCallback)NULL );
model_listWordsThrough( board->model, modelCol, modelRow, model_listWordsThrough( board->model, modelCol, modelRow,
stream ); stream );
util_cellSquareHeld( board->util, stream ); util_cellSquareHeld( board->util, stream );

18
xwords4/common/comms.c
View file

@ -1136,10 +1136,8 @@ makeElemWithID( CommsCtxt* comms, MsgID msgID, AddressRecord* rec,
newMsgElem->sendCount = 0; newMsgElem->sendCount = 0;
#endif #endif
hdrStream = mem_stream_make( MPPARM(comms->mpool) hdrStream = mem_stream_make_raw( MPPARM(comms->mpool)
util_getVTManager(comms->util), util_getVTManager(comms->util));
NULL, 0,
(MemStreamCloseCallback)NULL );
stream_open( hdrStream ); stream_open( hdrStream );
#if 0 < COMMS_VERSION #if 0 < COMMS_VERSION
stream_putU16( hdrStream, HAS_VERSION_FLAG ); stream_putU16( hdrStream, HAS_VERSION_FLAG );
@ -2637,10 +2635,8 @@ logAddr( const CommsCtxt* comms, const CommsAddrRec* addr, const char* caller )
{ {
if ( !!addr ) { if ( !!addr ) {
char buf[128]; char buf[128];
XWStreamCtxt* stream = mem_stream_make( MPPARM(comms->mpool) XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(comms->mpool)
util_getVTManager(comms->util), util_getVTManager(comms->util));
NULL, 0,
(MemStreamCloseCallback)NULL );
snprintf( buf, sizeof(buf), TAGFMT() "called on %p from %s:\n", TAGPRMS, snprintf( buf, sizeof(buf), TAGFMT() "called on %p from %s:\n", TAGPRMS,
addr, caller ); addr, caller );
stream_catString( stream, buf ); stream_catString( stream, buf );
@ -2942,10 +2938,8 @@ relay_msg_to_stream( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID,
{ {
XP_LOGF( "%s(cmd=%s, destID=%x)", __func__, relayCmdToStr(cmd), destID ); XP_LOGF( "%s(cmd=%s, destID=%x)", __func__, relayCmdToStr(cmd), destID );
XWStreamCtxt* stream; XWStreamCtxt* stream;
stream = mem_stream_make( MPPARM(comms->mpool) stream = mem_stream_make_raw( MPPARM(comms->mpool)
util_getVTManager(comms->util), util_getVTManager(comms->util) );
NULL, 0,
(MemStreamCloseCallback)NULL );
if ( stream != NULL ) { if ( stream != NULL ) {
CommsAddrRec addr; CommsAddrRec addr;
stream_open( stream ); stream_open( stream );

6
xwords4/common/model.c
View file

@ -2195,9 +2195,9 @@ static void
copyStack( const ModelCtxt* model, StackCtxt* destStack, copyStack( const ModelCtxt* model, StackCtxt* destStack,
const StackCtxt* srcStack ) const StackCtxt* srcStack )
{ {
XWStreamCtxt* stream = mem_stream_make( MPPARM(model->vol.mpool) XWStreamCtxt* stream =
util_getVTManager(model->vol.util), mem_stream_make_raw( MPPARM(model->vol.mpool)
NULL, 0, NULL ); util_getVTManager(model->vol.util) );
stack_writeToStream( (StackCtxt*)srcStack, stream ); stack_writeToStream( (StackCtxt*)srcStack, stream );
stack_loadFromStream( destStack, stream ); stack_loadFromStream( destStack, stream );

11
xwords4/common/movestak.c
View file

@ -120,9 +120,7 @@ stack_loadFromStream( StackCtxt* stack, XWStreamCtxt* stream )
stack->highWaterMark = stream_getU16( stream ); stack->highWaterMark = stream_getU16( stream );
stack->nEntries = stream_getU16( stream ); stack->nEntries = stream_getU16( stream );
stack->top = stream_getU32( stream ); stack->top = stream_getU32( stream );
stack->data = mem_stream_make( MPPARM(stack->mpool) stack->vtmgr, stack->data = mem_stream_make_raw( MPPARM(stack->mpool) stack->vtmgr );
NULL, 0,
(MemStreamCloseCallback)NULL );
stream_getFromStream( stack->data, stream, nBytes ); stream_getFromStream( stack->data, stream, nBytes );
} else { } else {
@ -164,8 +162,8 @@ StackCtxt*
stack_copy( const StackCtxt* stack ) stack_copy( const StackCtxt* stack )
{ {
StackCtxt* newStack = NULL; StackCtxt* newStack = NULL;
XWStreamCtxt* stream = mem_stream_make( MPPARM(stack->mpool) XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(stack->mpool)
stack->vtmgr, NULL, 0, NULL ); stack->vtmgr );
stack_writeToStream( stack, stream ); stack_writeToStream( stack, stream );
newStack = stack_make( MPPARM(stack->mpool) stack->vtmgr ); newStack = stack_make( MPPARM(stack->mpool) stack->vtmgr );
@ -184,8 +182,7 @@ pushEntryImpl( StackCtxt* stack, const StackEntry* entry )
XWStreamCtxt* stream = stack->data; XWStreamCtxt* stream = stack->data;
if ( !stream ) { if ( !stream ) {
stream = mem_stream_make( MPPARM(stack->mpool) stack->vtmgr, NULL, 0, stream = mem_stream_make_raw( MPPARM(stack->mpool) stack->vtmgr );
(MemStreamCloseCallback)NULL );
stack->data = stream; stack->data = stream;
} }

6
xwords4/common/server.c
View file

@ -828,10 +828,8 @@ static XWStreamCtxt*
mkServerStream( ServerCtxt* server ) mkServerStream( ServerCtxt* server )
{ {
XWStreamCtxt* stream; XWStreamCtxt* stream;
stream = mem_stream_make( MPPARM(server->mpool) stream = mem_stream_make_raw( MPPARM(server->mpool)
util_getVTManager(server->vol.util), util_getVTManager(server->vol.util) );
NULL, CHANNEL_NONE,
(MemStreamCloseCallback)NULL );
XP_ASSERT( !!stream ); XP_ASSERT( !!stream );
return stream; return stream;
} /* mkServerStream */ } /* mkServerStream */