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

remove some logging

Browse source
This commit is contained in:
Eric House 2019-02-05 09:37:39 -08:00
parent bd35503daa
commit bf2ab49c20
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DevID.java
View file

@ -83,7 +83,7 @@ public class DevID {
s_relayDevID = asStr; s_relayDevID = asStr;
} }
} }
Log.d( TAG, "getRelayDevID() => %s", s_relayDevID ); // Log.d( TAG, "getRelayDevID() => %s", s_relayDevID );
return s_relayDevID; return s_relayDevID;
} }

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
View file

@ -97,7 +97,7 @@ public class NetStateCache {
} }
boolean result = s_netAvail || s_onSDKSim; boolean result = s_netAvail || s_onSDKSim;
Log.d( TAG, "netAvail() => %b", result ); // Log.d( TAG, "netAvail() => %b", result );
return result; return result;
} }

6
xwords4/android/jni/xwjni.c
View file

@ -935,10 +935,10 @@ Java_org_eehouse_android_xw4_jni_XwJNI_initJNI
/* pthread_mutex_init( &state->msgMutex, NULL ); */ /* pthread_mutex_init( &state->msgMutex, NULL ); */
XP_LOGF( "%s: initing srand with %d", __func__, seed ); /* XP_LOGF( "%s: initing srand with %d", __func__, seed ); */
srandom( seed ); srandom( seed );
LOG_RETURNF( "%p", state ); /* LOG_RETURNF( "%p", state ); */
return (jint) state; return (jint) state;
} }
@ -973,7 +973,6 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1makeNewGame
CommonPrefs cp; CommonPrefs cp;
loadCommonPrefs( env, &cp, j_cp ); loadCommonPrefs( env, &cp, j_cp );
XP_LOGF( "calling game_makeNewGame" );
game_makeNewGame( MPPARM(mpool) &state->game, gi, globals->util, dctx, &cp, game_makeNewGame( MPPARM(mpool) &state->game, gi, globals->util, dctx, &cp,
globals->xportProcs ); globals->xportProcs );
@ -1000,7 +999,6 @@ JNIEXPORT void JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_game_1dispose
( JNIEnv* env, jclass claz, GamePtrType gamePtr ) ( JNIEnv* env, jclass claz, GamePtrType gamePtr )
{ {
JNIState* state = getState( env, gamePtr, __func__ ); JNIState* state = getState( env, gamePtr, __func__ );
LOG_FUNC();
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
MemPoolCtx* mpool = state->mpool; MemPoolCtx* mpool = state->mpool;

10
xwords4/common/game.c
View file

@ -557,7 +557,7 @@ gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi )
gi->nPlayers = (XP_U8)stream_getBits( stream, NPLAYERS_NBITS ); gi->nPlayers = (XP_U8)stream_getBits( stream, NPLAYERS_NBITS );
gi->boardSize = (XP_U8)stream_getBits( stream, nColsNBits ); gi->boardSize = (XP_U8)stream_getBits( stream, nColsNBits );
gi->serverRole = (DeviceRole)stream_getBits( stream, 2 ); gi->serverRole = (DeviceRole)stream_getBits( stream, 2 );
XP_LOGF( "%s: read serverRole of %d", __func__, gi->serverRole ); /* XP_LOGF( "%s: read serverRole of %d", __func__, gi->serverRole ); */
gi->hintsNotAllowed = stream_getBits( stream, 1 ); gi->hintsNotAllowed = stream_getBits( stream, 1 );
if ( strVersion < STREAM_VERS_ROBOTIQ ) { if ( strVersion < STREAM_VERS_ROBOTIQ ) {
(void)stream_getBits( stream, 2 ); (void)stream_getBits( stream, 2 );
@ -581,7 +581,7 @@ gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi )
if ( STREAM_VERS_MULTIADDR <= strVersion ) { if ( STREAM_VERS_MULTIADDR <= strVersion ) {
gi->forceChannel = stream_getBits( stream, 2 ); gi->forceChannel = stream_getBits( stream, 2 );
XP_LOGF( "%s: loaded forceChannel: %d", __func__, gi->forceChannel ); /* XP_LOGF( "%s: loaded forceChannel: %d", __func__, gi->forceChannel ); */
} }
gi->gameID = strVersion < STREAM_VERS_BLUETOOTH2 ? gi->gameID = strVersion < STREAM_VERS_BLUETOOTH2 ?
@ -623,7 +623,7 @@ gi_writeToStream( XWStreamCtxt* stream, const CurGameInfo* gi )
XP_U16 nColsNBits; XP_U16 nColsNBits;
#ifdef STREAM_VERS_BIGBOARD #ifdef STREAM_VERS_BIGBOARD
XP_U16 strVersion = stream_getVersion( stream ); XP_U16 strVersion = stream_getVersion( stream );
XP_LOGF( "%s: strVersion = 0x%x", __func__, strVersion ); /* XP_LOGF( "%s: strVersion = 0x%x", __func__, strVersion ); */
XP_ASSERT( STREAM_SAVE_PREVWORDS <= strVersion ); XP_ASSERT( STREAM_SAVE_PREVWORDS <= strVersion );
nColsNBits = STREAM_VERS_BIGBOARD > strVersion ? NUMCOLS_NBITS_4 nColsNBits = STREAM_VERS_BIGBOARD > strVersion ? NUMCOLS_NBITS_4
: NUMCOLS_NBITS_5; : NUMCOLS_NBITS_5;
@ -636,7 +636,7 @@ gi_writeToStream( XWStreamCtxt* stream, const CurGameInfo* gi )
stream_putBits( stream, NPLAYERS_NBITS, gi->nPlayers ); stream_putBits( stream, NPLAYERS_NBITS, gi->nPlayers );
stream_putBits( stream, nColsNBits, gi->boardSize ); stream_putBits( stream, nColsNBits, gi->boardSize );
stream_putBits( stream, 2, gi->serverRole ); stream_putBits( stream, 2, gi->serverRole );
XP_LOGF( "%s: wrote serverRole of %d", __func__, gi->serverRole ); /* XP_LOGF( "%s: wrote serverRole of %d", __func__, gi->serverRole ); */
stream_putBits( stream, 1, gi->hintsNotAllowed ); stream_putBits( stream, 1, gi->hintsNotAllowed );
stream_putBits( stream, 2, gi->phoniesAction ); stream_putBits( stream, 2, gi->phoniesAction );
stream_putBits( stream, 1, gi->timerEnabled ); stream_putBits( stream, 1, gi->timerEnabled );
@ -644,7 +644,7 @@ gi_writeToStream( XWStreamCtxt* stream, const CurGameInfo* gi )
stream_putBits( stream, 1, gi->allowHintRect ); stream_putBits( stream, 1, gi->allowHintRect );
stream_putBits( stream, 1, gi->confirmBTConnect ); stream_putBits( stream, 1, gi->confirmBTConnect );
stream_putBits( stream, 2, gi->forceChannel ); stream_putBits( stream, 2, gi->forceChannel );
XP_LOGF( "%s: wrote forceChannel: %d", __func__, gi->forceChannel ); /* XP_LOGF( "%s: wrote forceChannel: %d", __func__, gi->forceChannel ); */
if ( 0 ) { if ( 0 ) {
#ifdef STREAM_VERS_BIGBOARD #ifdef STREAM_VERS_BIGBOARD