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

cleanup (mostly non-DBG compile errors)

Browse source
This commit is contained in:
Eric House 2021-03-19 13:03:39 -07:00
parent fb0807c14b
commit d5546b484d
6 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/common/comms.c
View file

@ -1745,9 +1745,10 @@ comms_ackAny( CommsCtxt* comms, XWEnv xwe )
# define ackAnyImpl( comms, xwe, force ) # define ackAnyImpl( comms, xwe, force )
#endif #endif
# define CASESTR(s) case s: return #s
#ifdef XWFEATURE_RELAY #ifdef XWFEATURE_RELAY
# ifdef DEBUG # ifdef DEBUG
# define CASESTR(s) case s: return #s
static const char* static const char*
relayCmdToStr( XWRELAY_Cmd cmd ) relayCmdToStr( XWRELAY_Cmd cmd )
{ {
@ -2775,7 +2776,6 @@ setHeartbeatTimer( CommsCtxt* comms )
} /* setHeartbeatTimer */ } /* setHeartbeatTimer */
#endif #endif
#ifdef DEBUG
const char* const char*
ConnType2Str( CommsConnType typ ) ConnType2Str( CommsConnType typ )
{ {
@ -2796,6 +2796,7 @@ ConnType2Str( CommsConnType typ )
return "<unknown>"; return "<unknown>";
} /* ConnType2Str */ } /* ConnType2Str */
#ifdef DEBUG
void void
comms_getStats( CommsCtxt* comms, XWStreamCtxt* stream ) comms_getStats( CommsCtxt* comms, XWStreamCtxt* stream )
{ {

9
xwords4/common/comms.h
View file

@ -256,9 +256,14 @@ XP_Bool addr_iter( const CommsAddrRec* addr, CommsConnType* typp,
XP_U32* state ); XP_U32* state );
XP_Bool types_iter( XP_U32 conTypes, CommsConnType* typp, XP_U32* state ); XP_Bool types_iter( XP_U32 conTypes, CommsConnType* typp, XP_U32* state );
#ifdef XWFEATURE_KNOWNPLAYERS
void comms_gatherPlayers( CommsCtxt* comms, XWEnv xwe, XP_U32 created );
#endif
const char* ConnType2Str( CommsConnType typ );
# ifdef DEBUG # ifdef DEBUG
void comms_getStats( CommsCtxt* comms, XWStreamCtxt* stream ); void comms_getStats( CommsCtxt* comms, XWStreamCtxt* stream );
const char* ConnType2Str( CommsConnType typ );
const char* CommsRelayState2Str( CommsRelayState state ); const char* CommsRelayState2Str( CommsRelayState state );
const char* XWREASON2Str( XWREASON reason ); const char* XWREASON2Str( XWREASON reason );
@ -267,8 +272,6 @@ void comms_setAddrDisabled( CommsCtxt* comms, CommsConnType typ,
XP_Bool comms_getAddrDisabled( const CommsCtxt* comms, CommsConnType typ, XP_Bool comms_getAddrDisabled( const CommsCtxt* comms, CommsConnType typ,
XP_Bool send ); XP_Bool send );
void comms_gatherPlayers( CommsCtxt* comms, XWEnv xwe, XP_U32 created );
# else # else
# define comms_setAddrDisabled( comms, typ, send, enabled ) # define comms_setAddrDisabled( comms, typ, send, enabled )
# define comms_getAddrDisabled( comms, typ, send ) XP_FALSE # define comms_getAddrDisabled( comms, typ, send ) XP_FALSE

10
xwords4/common/dictnry.c
View file

@ -829,16 +829,6 @@ dict_loadFromStream( DictionaryCtxt* dict, XWEnv xwe, XWStreamCtxt* stream )
setBlankTile( dict ); setBlankTile( dict );
} /* dict_loadFromStream */ } /* dict_loadFromStream */
void
dict_skipFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream )
{
DictionaryCtxt* dict = XP_CALLOC( mpool, sizeof(*dict)); /* leaked */
MPASSIGN( dict->mpool, mpool );
dict_ref( dict, xwe ); /* so unref works :-) */
dict_loadFromStream( dict, xwe, stream );
dict_unref( dict, xwe );
}
#ifdef TEXT_MODEL #ifdef TEXT_MODEL
/* Return the strlen of the longest face, e.g. 1 for English and Italian; /* Return the strlen of the longest face, e.g. 1 for English and Italian;
2 for Spanish; 3 for Catalan */ 2 for Spanish; 3 for Catalan */

2
xwords4/common/game.c
View file

@ -77,7 +77,7 @@ checkServerRole( CurGameInfo* gi, XP_U16* nPlayersHere,
} /* checkServerRole */ } /* checkServerRole */
static XP_U32 static XP_U32
makeGameID( XW_UtilCtxt* util ) makeGameID( XW_UtilCtxt* XP_UNUSED_DBG(util) )
{ {
XP_U32 gameID = 0; XP_U32 gameID = 0;
assertUtilOK( util ); assertUtilOK( util );

4
xwords4/common/knownplyr.c
View file

@ -163,7 +163,7 @@ makeUniqueName( const KPState* state, const XP_UCHAR* name,
* For early testing, however, just make a new name. * For early testing, however, just make a new name.
*/ */
static void static void
addPlayer( XW_DUtilCtxt* 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)", name );
@ -320,7 +320,7 @@ kplr_nameForMqttDev( XW_DUtilCtxt* dutil, XWEnv xwe, const XP_UCHAR* mqttDevID )
} }
static void static void
freeKP( XW_DUtilCtxt* dutil, KnownPlayer* kp ) freeKP( XW_DUtilCtxt* XP_UNUSED_DBG(dutil), KnownPlayer* kp )
{ {
XP_FREEP( dutil->mpool, &kp->name ); XP_FREEP( dutil->mpool, &kp->name );
XP_FREE( dutil->mpool, kp ); XP_FREE( dutil->mpool, kp );

2
xwords4/linux/mqttcon.c
View file

@ -105,7 +105,7 @@ subscribe_callback( struct mosquitto *mosq, void *userdata, int mid,
static void static void
log_callback( struct mosquitto *mosq, void *userdata, int level, log_callback( struct mosquitto *mosq, void *userdata, int level,
const char* XP_UNUSED_DBG(str) ) const char* str )
{ {
XP_USE(mosq); XP_USE(mosq);
XP_USE(userdata); XP_USE(userdata);