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

some logging to remove

Browse source
This commit is contained in:
Eric House 2024-02-08 11:59:12 -08:00
parent e9e6802f58
commit 183b656d2a
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/common/knownplyr.c
View file

@ -51,6 +51,7 @@ loadFromStream( XW_DUtilCtxt* dutil, KPState* state, XWStreamCtxt* stream )
{ {
while ( 0 < stream_getSize( stream ) ) { while ( 0 < stream_getSize( stream ) ) {
XP_U32 newestMod = stream_getU32( stream ); XP_U32 newestMod = stream_getU32( stream );
XP_LOGFF( "read newestMod: %d", newestMod );
XP_UCHAR buf[64]; XP_UCHAR buf[64];
stringFromStreamHere( stream, buf, VSIZE(buf) ); stringFromStreamHere( stream, buf, VSIZE(buf) );
@ -93,6 +94,7 @@ saveProc( const DLHead* dl, void* closure )
XWStreamCtxt* stream = (XWStreamCtxt*)closure; XWStreamCtxt* stream = (XWStreamCtxt*)closure;
KnownPlayer* kp = (KnownPlayer*)dl; KnownPlayer* kp = (KnownPlayer*)dl;
stream_putU32( stream, kp->newestMod ); stream_putU32( stream, kp->newestMod );
XP_LOGFF( "wrote newestMod: %d for player %s", kp->newestMod, kp->name );
stringToStream( stream, kp->name ); stringToStream( stream, kp->name );
addrToStream( stream, &kp->addr ); addrToStream( stream, &kp->addr );
} }
@ -186,7 +188,7 @@ static void
addPlayer( XW_DUtilCtxt* XP_UNUSED_DBG(dutil), KPState* state, const XP_UCHAR* name, addPlayer( XW_DUtilCtxt* XP_UNUSED_DBG(dutil), KPState* state, const XP_UCHAR* name,
const CommsAddrRec* addr, XP_U32 newestMod ) const CommsAddrRec* addr, XP_U32 newestMod )
{ {
XP_LOGFF( "(name=%s)", name ); XP_LOGFF( "(name=%s, newestMod: %d)", name, newestMod );
KnownPlayer* withSameDevID = NULL; KnownPlayer* withSameDevID = NULL;
KnownPlayer* withSameName = NULL; KnownPlayer* withSameName = NULL;
@ -201,13 +203,18 @@ addPlayer( XW_DUtilCtxt* XP_UNUSED_DBG(dutil), KPState* state, const XP_UCHAR* n
} }
} }
XP_LOGFF( "withSameDevID: %p; withSameName: %p", withSameDevID, withSameName );
XP_UCHAR tmpName[64]; XP_UCHAR tmpName[64];
if ( !!withSameDevID ) { /* only one allowed */ if ( !!withSameDevID ) { /* only one allowed */
XP_Bool isNewer = newestMod > withSameDevID->newestMod; XP_Bool isNewer = newestMod > withSameDevID->newestMod;
XP_Bool changed = augmentAddr( &withSameDevID->addr, addr, isNewer ); XP_Bool changed = augmentAddr( &withSameDevID->addr, addr, isNewer );
if ( isNewer ) { if ( isNewer ) {
XP_LOGFF( "updating newestMod from %d to %d", withSameDevID->newestMod, newestMod );
withSameDevID->newestMod = newestMod; withSameDevID->newestMod = newestMod;
changed = XP_TRUE; changed = XP_TRUE;
} else {
XP_LOGFF( "not newer" );
} }
state->dirty = changed || state->dirty; state->dirty = changed || state->dirty;
} else { } else {