Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

cleanup -- no behavior change

Browse source
This commit is contained in:
Eric House 2022-01-08 20:38:29 -08:00
parent ce6537f2a9
commit d9b1fb4df6
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/common/comms.c
View file

@ -677,18 +677,17 @@ comms_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
RoleChangeProc rcp, void* rcClosure, RoleChangeProc rcp, void* rcClosure,
XP_U16 forceChannel ) XP_U16 forceChannel )
{ {
XP_U16 nPlayersHere, nPlayersTotal;
AddressRecord** prevsAddrNext;
MsgQueueElem** prevsQueueNext;
XP_U16 version = stream_getVersion( stream ); XP_U16 version = stream_getVersion( stream );
CommsAddrRec addr = {0};
XP_U8 flags = stream_getU8( stream ); XP_U8 flags = stream_getU8( stream );
if ( version < STREAM_VERS_GICREATED ) { if ( version < STREAM_VERS_GICREATED ) {
flags = 0; flags = 0;
} }
CommsAddrRec addr = {0};
addrFromStream( &addr, stream ); addrFromStream( &addr, stream );
XP_U16 nPlayersHere, nPlayersTotal;
if ( version >= STREAM_VERS_DEVIDS if ( version >= STREAM_VERS_DEVIDS
|| addr_hasType( &addr, COMMS_CONN_RELAY ) ) { || addr_hasType( &addr, COMMS_CONN_RELAY ) ) {
nPlayersHere = (XP_U16)stream_getBits( stream, 4 ); nPlayersHere = (XP_U16)stream_getBits( stream, 4 );
@ -730,7 +729,7 @@ comms_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
comms->queueLen = stream_getU8( stream ); comms->queueLen = stream_getU8( stream );
XP_U16 nAddrRecs = stream_getU8( stream ); XP_U16 nAddrRecs = stream_getU8( stream );
prevsAddrNext = &comms->recs; AddressRecord** prevsAddrNext = &comms->recs;
for ( int ii = 0; ii < nAddrRecs; ++ii ) { for ( int ii = 0; ii < nAddrRecs; ++ii ) {
AddressRecord* rec = (AddressRecord*)XP_CALLOC( mpool, sizeof(*rec)); AddressRecord* rec = (AddressRecord*)XP_CALLOC( mpool, sizeof(*rec));
@ -760,7 +759,7 @@ comms_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
prevsAddrNext = &rec->next; prevsAddrNext = &rec->next;
} }
prevsQueueNext = &comms->msgQueueHead; MsgQueueElem** prevsQueueNext = &comms->msgQueueHead;
for ( int ii = 0; ii < comms->queueLen; ++ii ) { for ( int ii = 0; ii < comms->queueLen; ++ii ) {
MsgQueueElem* msg = (MsgQueueElem*)XP_CALLOC( mpool, sizeof(*msg) ); MsgQueueElem* msg = (MsgQueueElem*)XP_CALLOC( mpool, sizeof(*msg) );