From 03eef94a8d62f868ca37fd1174808d9a0adec22d Mon Sep 17 00:00:00 2001 From: Jing Mike Date: Mon, 20 Feb 2023 15:43:42 +0800 Subject: Remove unused variables Since some variables with module LatinIME are defined but not used, when compiled with build combination "sdk_pc_x86_64-userdebug" and build command "mmm packages/inputmethods/LatinIME", the following code lines will be reported that "variable 'XXX' set but not used". (should be similar for all the other build combinations) Repeated 10 times for each: terminal_position_lookup_table.cpp:74:9 removedEntryCount terminal_position_lookup_table.cpp:85:9 removedEntryCount proximity_info_state_utils.cpp:493:9 tempTime trie_map.cpp:56:9 unusedRegionSize suggestion_results.cpp:100:9 index Repeated 80+ times: proximity_info_utils.h:75:25 proximityChar With this patch we are removing some of the unused variables and putting the C++ 17 attribute [[maybe_unused]] to the others which are used for logging. Then all the related build warnings have been eliminated. Test: mmm packages/inputmethods/LatinIME, presubmit check. Change-Id: Ia66766322d6ae8a010b1cb55cc22993fbc6d012c Signed-off-by: Jing Mike --- .../backward/v402/content/terminal_position_lookup_table.cpp | 2 -- .../structure/v4/content/terminal_position_lookup_table.cpp | 2 -- native/jni/src/dictionary/utils/trie_map.cpp | 2 +- native/jni/src/suggest/core/layout/proximity_info_state_utils.cpp | 4 ---- native/jni/src/suggest/core/layout/proximity_info_utils.h | 2 +- native/jni/src/suggest/core/result/suggestion_results.cpp | 2 +- 6 files changed, 3 insertions(+), 11 deletions(-) (limited to 'native') diff --git a/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp b/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp index 30b72bbd1..317710ca4 100644 --- a/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp @@ -82,14 +82,12 @@ bool TerminalPositionLookupTable::flushToFile(const char *const dictPath) const } bool TerminalPositionLookupTable::runGCTerminalIds(TerminalIdMap *const terminalIdMap) { - int removedEntryCount = 0; int nextNewTerminalId = 0; for (int i = 0; i < mSize; ++i) { const int terminalPos = getBuffer()->readUint( Ver4DictConstants::TERMINAL_ADDRESS_TABLE_ADDRESS_SIZE, getEntryPos(i)); if (terminalPos == Ver4DictConstants::NOT_A_TERMINAL_ADDRESS) { // This entry is a garbage. - removedEntryCount++; } else { // Give a new terminal id to the entry. if (!getWritableBuffer()->writeUint(terminalPos, diff --git a/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.cpp b/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.cpp index 5503151fd..e4d7c2dd6 100644 --- a/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.cpp +++ b/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.cpp @@ -71,14 +71,12 @@ bool TerminalPositionLookupTable::flushToFile(FILE *const file) const { } bool TerminalPositionLookupTable::runGCTerminalIds(TerminalIdMap *const terminalIdMap) { - int removedEntryCount = 0; int nextNewTerminalId = 0; for (int i = 0; i < mSize; ++i) { const int terminalPos = getBuffer()->readUint( Ver4DictConstants::TERMINAL_ADDRESS_TABLE_ADDRESS_SIZE, getEntryPos(i)); if (terminalPos == Ver4DictConstants::NOT_A_TERMINAL_ADDRESS) { // This entry is a garbage. - removedEntryCount++; } else { // Give a new terminal id to the entry. if (!getWritableBuffer()->writeUint(terminalPos, diff --git a/native/jni/src/dictionary/utils/trie_map.cpp b/native/jni/src/dictionary/utils/trie_map.cpp index 0bef8c702..19ad9c51f 100644 --- a/native/jni/src/dictionary/utils/trie_map.cpp +++ b/native/jni/src/dictionary/utils/trie_map.cpp @@ -53,7 +53,7 @@ void TrieMap::dump(const int from, const int to) const { for (int i = from; i < to; ++i) { AKLOGI("Entry[%d]: %x, %x", i, readField0(i), readField1(i)); } - int unusedRegionSize = 0; + [[maybe_unused]] int unusedRegionSize = 0; for (int i = 1; i <= MAX_NUM_OF_ENTRIES_IN_ONE_LEVEL; ++i) { int index = readEmptyTableLink(i); while (index != ROOT_BITMAP_ENTRY_INDEX) { diff --git a/native/jni/src/suggest/core/layout/proximity_info_state_utils.cpp b/native/jni/src/suggest/core/layout/proximity_info_state_utils.cpp index 0aeb36aad..0aa6caff7 100644 --- a/native/jni/src/suggest/core/layout/proximity_info_state_utils.cpp +++ b/native/jni/src/suggest/core/layout/proximity_info_state_utils.cpp @@ -490,12 +490,10 @@ namespace latinime { const int x0 = (*sampledInputXs)[id]; const int y0 = (*sampledInputYs)[id]; const int actualInputIndex = (*sampledInputIndices)[id]; - int tempTime = 0; int tempBeelineDistance = 0; int start = actualInputIndex; // lookup forward while (start > 0 && tempBeelineDistance < lookupRadius) { - tempTime += times[start] - times[start - 1]; --start; tempBeelineDistance = GeometryUtils::getDistanceInt(x0, y0, xCoordinates[start], yCoordinates[start]); @@ -504,12 +502,10 @@ namespace latinime { if (start > 0 && start < actualInputIndex) { ++start; } - tempTime= 0; tempBeelineDistance = 0; int end = actualInputIndex; // lookup backward while (end < (inputSize - 1) && tempBeelineDistance < lookupRadius) { - tempTime += times[end + 1] - times[end]; ++end; tempBeelineDistance = GeometryUtils::getDistanceInt(x0, y0, xCoordinates[end], yCoordinates[end]); diff --git a/native/jni/src/suggest/core/layout/proximity_info_utils.h b/native/jni/src/suggest/core/layout/proximity_info_utils.h index 79d0615b8..003796161 100644 --- a/native/jni/src/suggest/core/layout/proximity_info_utils.h +++ b/native/jni/src/suggest/core/layout/proximity_info_utils.h @@ -72,7 +72,7 @@ class ProximityInfoUtils { for (int i = 0; i < inputSize; ++i) { AKLOGI("---"); for (int j = 0; j < MAX_PROXIMITY_CHARS_SIZE; ++j) { - int proximityChar = + [[maybe_unused]] int proximityChar = inputProximities[i * MAX_PROXIMITY_CHARS_SIZE + j]; proximityChar += 0; AKLOGI("--- (%d)%c", i, proximityChar); diff --git a/native/jni/src/suggest/core/result/suggestion_results.cpp b/native/jni/src/suggest/core/result/suggestion_results.cpp index 3756d1092..312c9e72f 100644 --- a/native/jni/src/suggest/core/result/suggestion_results.cpp +++ b/native/jni/src/suggest/core/result/suggestion_results.cpp @@ -97,7 +97,7 @@ void SuggestionResults::dumpSuggestions() const { suggestedWords.push_back(copyOfSuggestedWords.top()); copyOfSuggestedWords.pop(); } - int index = 0; + [[maybe_unused]] int index = 0; for (auto it = suggestedWords.rbegin(); it != suggestedWords.rend(); ++it) { DUMP_SUGGESTION(it->getCodePoint(), it->getCodePointCount(), index, it->getScore()); index++; -- cgit v1.2.3-83-g751a