From bf2ab49c20a8aa872f3db2f73c79f9c1eac13512 Mon Sep 17 00:00:00 2001 From: Eric House Date: Tue, 5 Feb 2019 09:37:39 -0800 Subject: [PATCH] remove some logging --- .../src/main/java/org/eehouse/android/xw4/DevID.java | 2 +- .../java/org/eehouse/android/xw4/NetStateCache.java | 2 +- xwords4/android/jni/xwjni.c | 6 ++---- xwords4/common/game.c | 10 +++++----- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DevID.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DevID.java index 2b7b6db57..a3e75e1ed 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DevID.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DevID.java @@ -83,7 +83,7 @@ public class DevID { s_relayDevID = asStr; } } - Log.d( TAG, "getRelayDevID() => %s", s_relayDevID ); + // Log.d( TAG, "getRelayDevID() => %s", s_relayDevID ); return s_relayDevID; } diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java index 198aa5c48..2c26694e2 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java @@ -97,7 +97,7 @@ public class NetStateCache { } boolean result = s_netAvail || s_onSDKSim; - Log.d( TAG, "netAvail() => %b", result ); + // Log.d( TAG, "netAvail() => %b", result ); return result; } diff --git a/xwords4/android/jni/xwjni.c b/xwords4/android/jni/xwjni.c index be3b40132..601fef82b 100644 --- a/xwords4/android/jni/xwjni.c +++ b/xwords4/android/jni/xwjni.c @@ -935,10 +935,10 @@ Java_org_eehouse_android_xw4_jni_XwJNI_initJNI /* 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 ); - LOG_RETURNF( "%p", state ); + /* LOG_RETURNF( "%p", state ); */ return (jint) state; } @@ -973,7 +973,6 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1makeNewGame CommonPrefs cp; loadCommonPrefs( env, &cp, j_cp ); - XP_LOGF( "calling game_makeNewGame" ); game_makeNewGame( MPPARM(mpool) &state->game, gi, globals->util, dctx, &cp, globals->xportProcs ); @@ -1000,7 +999,6 @@ JNIEXPORT void JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_game_1dispose ( JNIEnv* env, jclass claz, GamePtrType gamePtr ) { JNIState* state = getState( env, gamePtr, __func__ ); - LOG_FUNC(); #ifdef MEM_DEBUG MemPoolCtx* mpool = state->mpool; diff --git a/xwords4/common/game.c b/xwords4/common/game.c index cfb1ffe40..8a7acd5c9 100644 --- a/xwords4/common/game.c +++ b/xwords4/common/game.c @@ -557,7 +557,7 @@ gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi ) gi->nPlayers = (XP_U8)stream_getBits( stream, NPLAYERS_NBITS ); gi->boardSize = (XP_U8)stream_getBits( stream, nColsNBits ); 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 ); if ( strVersion < STREAM_VERS_ROBOTIQ ) { (void)stream_getBits( stream, 2 ); @@ -581,7 +581,7 @@ gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi ) if ( STREAM_VERS_MULTIADDR <= strVersion ) { 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 ? @@ -623,7 +623,7 @@ gi_writeToStream( XWStreamCtxt* stream, const CurGameInfo* gi ) XP_U16 nColsNBits; #ifdef STREAM_VERS_BIGBOARD 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 ); nColsNBits = STREAM_VERS_BIGBOARD > strVersion ? NUMCOLS_NBITS_4 : NUMCOLS_NBITS_5; @@ -636,7 +636,7 @@ gi_writeToStream( XWStreamCtxt* stream, const CurGameInfo* gi ) stream_putBits( stream, NPLAYERS_NBITS, gi->nPlayers ); stream_putBits( stream, nColsNBits, gi->boardSize ); 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, 2, gi->phoniesAction ); 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->confirmBTConnect ); 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 ) { #ifdef STREAM_VERS_BIGBOARD