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

replace firing assert with logging

Browse source
This commit is contained in:
Eric House 2024-11-06 08:15:11 -08:00
parent e4f10d4850
commit e87577a8e4
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
xwords4/common/server.c
View file

@ -4362,7 +4362,8 @@ getRematchInfoImpl( const ServerCtxt* server, XWEnv xwe, CurGameInfo* newGI,
if ( newGI->players[ii].isLocal ) {
ri_addLocal( &ri );
} else if ( nextRemote < nAddrs ) {
ri_addAddrAt( server->vol.dutil, xwe, &ri, &addrs[nextRemote++], ii );
ri_addAddrAt( server->vol.dutil, xwe, &ri,
&addrs[nextRemote++], ii );
} else {
SRVR_LOGFF( "ERROR: not enough addresses for all"
" remote players" );
@ -4371,10 +4372,15 @@ getRematchInfoImpl( const ServerCtxt* server, XWEnv xwe, CurGameInfo* newGI,
}
if ( success ) {
success = nextRemote == nAddrs;
if ( !success ) {
XP_LOGFF( "addr count mismatch: nextRemote: %d vs nAddrs: %d",
nextRemote, nAddrs );
}
}
}
} else {
success = XP_FALSE;
XP_LOGFF( "rematch.addrs not set" );
}
if ( success && canOrder ) {
@ -4382,6 +4388,9 @@ getRematchInfoImpl( const ServerCtxt* server, XWEnv xwe, CurGameInfo* newGI,
assertRI( &ri, newGI );
}
success = setPlayerOrder( server, nop, newGI, !!comms ? &ri : NULL );
if ( !success ) {
XP_LOGFF( "setPlayerOrder failed" );
}
}
if ( success && !!comms ) {
@ -4393,7 +4402,7 @@ getRematchInfoImpl( const ServerCtxt* server, XWEnv xwe, CurGameInfo* newGI,
} else {
*ripp = NULL;
}
XP_ASSERT( success );
// XP_ASSERT( success ); /* this is firing */
LOG_RETURNF( "%s", boolToStr(success) );
return success;