From d46a4d13ba08a5e45fc78917d88e10f45b0065cb Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 27 Jun 2018 23:42:50 -0700 Subject: [PATCH] use mem_stream_make_raw() where possible in common code --- xwords4/common/board.c | 11 ++++------- xwords4/common/comms.c | 18 ++++++------------ xwords4/common/model.c | 6 +++--- xwords4/common/movestak.c | 11 ++++------- xwords4/common/server.c | 6 ++---- 5 files changed, 19 insertions(+), 33 deletions(-) diff --git a/xwords4/common/board.c b/xwords4/common/board.c index 774b1bf51..9825b6226 100644 --- a/xwords4/common/board.c +++ b/xwords4/common/board.c @@ -1090,9 +1090,8 @@ board_commitTurn( BoardCtxt* board, XP_Bool phoniesConfirmed, XP_MEMSET( &bwl, 0, sizeof(bwl) ); if ( !legal ) { - stream = mem_stream_make( MPPARM(board->mpool) - util_getVTManager(board->util), NULL, - CHANNEL_NONE, (MemStreamCloseCallback)NULL ); + stream = mem_stream_make_raw( MPPARM(board->mpool) + util_getVTManager(board->util) ); const XP_UCHAR* str = util_getUserString(board->util, STR_COMMIT_CONFIRM); @@ -1319,10 +1318,8 @@ timerFiredForPen( BoardCtxt* board ) NULL, NULL, NULL ); if ( listWords ) { XWStreamCtxt* stream = - mem_stream_make( MPPARM(board->mpool) - util_getVTManager(board->util), NULL, - CHANNEL_NONE, - (MemStreamCloseCallback)NULL ); + mem_stream_make_raw( MPPARM(board->mpool) + util_getVTManager(board->util) ); model_listWordsThrough( board->model, modelCol, modelRow, stream ); util_cellSquareHeld( board->util, stream ); diff --git a/xwords4/common/comms.c b/xwords4/common/comms.c index 5e2a73dae..3011aa4ae 100644 --- a/xwords4/common/comms.c +++ b/xwords4/common/comms.c @@ -1136,10 +1136,8 @@ makeElemWithID( CommsCtxt* comms, MsgID msgID, AddressRecord* rec, newMsgElem->sendCount = 0; #endif - hdrStream = mem_stream_make( MPPARM(comms->mpool) - util_getVTManager(comms->util), - NULL, 0, - (MemStreamCloseCallback)NULL ); + hdrStream = mem_stream_make_raw( MPPARM(comms->mpool) + util_getVTManager(comms->util)); stream_open( hdrStream ); #if 0 < COMMS_VERSION stream_putU16( hdrStream, HAS_VERSION_FLAG ); @@ -2637,10 +2635,8 @@ logAddr( const CommsCtxt* comms, const CommsAddrRec* addr, const char* caller ) { if ( !!addr ) { char buf[128]; - XWStreamCtxt* stream = mem_stream_make( MPPARM(comms->mpool) - util_getVTManager(comms->util), - NULL, 0, - (MemStreamCloseCallback)NULL ); + XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(comms->mpool) + util_getVTManager(comms->util)); snprintf( buf, sizeof(buf), TAGFMT() "called on %p from %s:\n", TAGPRMS, addr, caller ); 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 ); XWStreamCtxt* stream; - stream = mem_stream_make( MPPARM(comms->mpool) - util_getVTManager(comms->util), - NULL, 0, - (MemStreamCloseCallback)NULL ); + stream = mem_stream_make_raw( MPPARM(comms->mpool) + util_getVTManager(comms->util) ); if ( stream != NULL ) { CommsAddrRec addr; stream_open( stream ); diff --git a/xwords4/common/model.c b/xwords4/common/model.c index 76f89a292..4ac74753c 100644 --- a/xwords4/common/model.c +++ b/xwords4/common/model.c @@ -2195,9 +2195,9 @@ static void copyStack( const ModelCtxt* model, StackCtxt* destStack, const StackCtxt* srcStack ) { - XWStreamCtxt* stream = mem_stream_make( MPPARM(model->vol.mpool) - util_getVTManager(model->vol.util), - NULL, 0, NULL ); + XWStreamCtxt* stream = + mem_stream_make_raw( MPPARM(model->vol.mpool) + util_getVTManager(model->vol.util) ); stack_writeToStream( (StackCtxt*)srcStack, stream ); stack_loadFromStream( destStack, stream ); diff --git a/xwords4/common/movestak.c b/xwords4/common/movestak.c index a76450fb5..9f9f2130a 100644 --- a/xwords4/common/movestak.c +++ b/xwords4/common/movestak.c @@ -120,9 +120,7 @@ stack_loadFromStream( StackCtxt* stack, XWStreamCtxt* stream ) stack->highWaterMark = stream_getU16( stream ); stack->nEntries = stream_getU16( stream ); stack->top = stream_getU32( stream ); - stack->data = mem_stream_make( MPPARM(stack->mpool) stack->vtmgr, - NULL, 0, - (MemStreamCloseCallback)NULL ); + stack->data = mem_stream_make_raw( MPPARM(stack->mpool) stack->vtmgr ); stream_getFromStream( stack->data, stream, nBytes ); } else { @@ -164,8 +162,8 @@ StackCtxt* stack_copy( const StackCtxt* stack ) { StackCtxt* newStack = NULL; - XWStreamCtxt* stream = mem_stream_make( MPPARM(stack->mpool) - stack->vtmgr, NULL, 0, NULL ); + XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(stack->mpool) + stack->vtmgr ); stack_writeToStream( stack, stream ); newStack = stack_make( MPPARM(stack->mpool) stack->vtmgr ); @@ -184,8 +182,7 @@ pushEntryImpl( StackCtxt* stack, const StackEntry* entry ) XWStreamCtxt* stream = stack->data; if ( !stream ) { - stream = mem_stream_make( MPPARM(stack->mpool) stack->vtmgr, NULL, 0, - (MemStreamCloseCallback)NULL ); + stream = mem_stream_make_raw( MPPARM(stack->mpool) stack->vtmgr ); stack->data = stream; } diff --git a/xwords4/common/server.c b/xwords4/common/server.c index a146eee8b..d45a499a0 100644 --- a/xwords4/common/server.c +++ b/xwords4/common/server.c @@ -828,10 +828,8 @@ static XWStreamCtxt* mkServerStream( ServerCtxt* server ) { XWStreamCtxt* stream; - stream = mem_stream_make( MPPARM(server->mpool) - util_getVTManager(server->vol.util), - NULL, CHANNEL_NONE, - (MemStreamCloseCallback)NULL ); + stream = mem_stream_make_raw( MPPARM(server->mpool) + util_getVTManager(server->vol.util) ); XP_ASSERT( !!stream ); return stream; } /* mkServerStream */