From 6f0627b5d84191f248921ad9075a3c5c9a7ebf5e Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Thu, 20 Jun 2019 11:51:27 -0700 Subject: [PATCH] ICU-20672 Compiler Warning Cleanup. --- icu4c/source/common/ucptrie.cpp | 2 +- icu4c/source/i18n/listformatter.cpp | 4 ++-- icu4c/source/test/cintltst/ccaltst.c | 2 +- icu4c/source/test/cintltst/cloctst.c | 1 + icu4c/source/test/cintltst/cnumtst.c | 3 +++ icu4c/source/test/intltest/caltest.cpp | 6 +++++- .../test/intltest/datadrivennumberformattestsuite.cpp | 2 +- icu4c/source/test/intltest/rbbitst.cpp | 2 +- icu4c/source/test/intltest/transrt.cpp | 1 + 9 files changed, 16 insertions(+), 7 deletions(-) diff --git a/icu4c/source/common/ucptrie.cpp b/icu4c/source/common/ucptrie.cpp index b72e318387a..0004160a238 100644 --- a/icu4c/source/common/ucptrie.cpp +++ b/icu4c/source/common/ucptrie.cpp @@ -280,7 +280,7 @@ UChar32 getRange(const void *t, UChar32 start, int32_t prevI3Block = -1; int32_t prevBlock = -1; UChar32 c = start; - uint32_t trieValue, value; + uint32_t trieValue, value = nullValue; bool haveValue = false; do { int32_t i3Block; diff --git a/icu4c/source/i18n/listformatter.cpp b/icu4c/source/i18n/listformatter.cpp index fa518fef7e2..2ee5e123749 100644 --- a/icu4c/source/i18n/listformatter.cpp +++ b/icu4c/source/i18n/listformatter.cpp @@ -478,8 +478,8 @@ UnicodeString& ListFormatter::format_( if (index == 0) { offset = 0; } - int32_t offsetFirst; - int32_t offsetSecond; + int32_t offsetFirst = 0; + int32_t offsetSecond = 0; int32_t prefixLength = 0; // for n items, there are 2 * (n + 1) boundary including 0 and the upper // edge. diff --git a/icu4c/source/test/cintltst/ccaltst.c b/icu4c/source/test/cintltst/ccaltst.c index ce84ddd870f..ea6f84f7f76 100644 --- a/icu4c/source/test/cintltst/ccaltst.c +++ b/icu4c/source/test/cintltst/ccaltst.c @@ -40,7 +40,7 @@ void TestGetTZTransition(void); void TestGetWindowsTimeZoneID(void); void TestGetTimeZoneIDByWindowsID(void); -void TestJpnCalAddSetNextEra(); +void TestJpnCalAddSetNextEra(void); void addCalTest(TestNode** root); diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index e8ddf76e840..3940a78a820 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -1783,6 +1783,7 @@ static void TestKeywordVariants(void) status = U_ZERO_ERROR; resultLen = uloc_getName(testCases[i].localeID, buffer, 256, &status); + (void)resultLen; U_ASSERT(resultLen < 256); if (U_SUCCESS(status)) { if (testCases[i].expectedLocaleID == 0) { diff --git a/icu4c/source/test/cintltst/cnumtst.c b/icu4c/source/test/cintltst/cnumtst.c index 214362cf8f9..1af478369f0 100644 --- a/icu4c/source/test/cintltst/cnumtst.c +++ b/icu4c/source/test/cintltst/cnumtst.c @@ -1836,6 +1836,7 @@ static void TestRBNFRounding() { } len = unum_formatDouble(fmt, 10.123456789, fmtbuf, FORMAT_BUF_CAPACITY, NULL, &status); U_ASSERT(len < FORMAT_BUF_CAPACITY); + (void)len; if (U_FAILURE(status)) { log_err_status(status, "unum_formatDouble 10.123456789 failed with %s\n", u_errorName(status)); } @@ -3235,6 +3236,7 @@ static void TestParseCases(void) { status = U_ZERO_ERROR; decstr[0] = 0; dclen = unum_parseDecimal(unumDec, itemPtr->text, -1, &parsePos, decstr, 32, &status); + (void)dclen; if (status != itemPtr->decStatus || parsePos != itemPtr->decPos || uprv_strcmp(decstr,itemPtr->decString) != 0) { char btext[32]; u_austrcpy(btext, itemPtr->text); @@ -3366,6 +3368,7 @@ static void TestSetMaxFracAndRoundIncr(void) { status = U_ZERO_ERROR; ulen = unum_toPattern(unf, FALSE, ubuf, kUBufMax, &status); + (void)ulen; if ( U_FAILURE(status) ) { log_err("test %s: unum_toPattern fails with %s\n", itemPtr->descrip, u_errorName(status)); } else if (u_strcmp(ubuf,itemPtr->expPattern)!=0) { diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp index e1c9fda10a8..ab4966758a4 100644 --- a/icu4c/source/test/intltest/caltest.cpp +++ b/icu4c/source/test/intltest/caltest.cpp @@ -1110,7 +1110,11 @@ CalendarTest::TestAddRollExtensive() status = U_ZERO_ERROR; for (i = 0; i < limit; i++) { temp->add(e, 1, status); - if (U_FAILURE(status)) { limit = i; status = U_ZERO_ERROR; } + if (U_FAILURE(status)) { + limit = i; + status = U_ZERO_ERROR; + break; // Suppress compile warning. Shouldn't be necessary, but it is. + } } for (i = 0; i < limit; i++) { temp->add(e, -1, status); diff --git a/icu4c/source/test/intltest/datadrivennumberformattestsuite.cpp b/icu4c/source/test/intltest/datadrivennumberformattestsuite.cpp index c8f10d13264..22a72f314a2 100644 --- a/icu4c/source/test/intltest/datadrivennumberformattestsuite.cpp +++ b/icu4c/source/test/intltest/datadrivennumberformattestsuite.cpp @@ -38,7 +38,7 @@ void DataDrivenNumberFormatTestSuite::run(const char *fileName, UBool runAllTest } UnicodeString columnValues[kNumberFormatTestTupleFieldCount]; ENumberFormatTestTupleField columnTypes[kNumberFormatTestTupleFieldCount]; - int32_t columnCount; + int32_t columnCount = 0; int32_t state = 0; while(U_SUCCESS(status)) { // Read a new line if necessary. diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp index ee03fb778aa..852cc79034e 100644 --- a/icu4c/source/test/intltest/rbbitst.cpp +++ b/icu4c/source/test/intltest/rbbitst.cpp @@ -736,7 +736,7 @@ void RBBITest::TestExtended() { int32_t tagValue = 0; // The numeric value of a tag. UnicodeString rules; // Holds rules from a ... block - int32_t rulesFirstLine; // Line number of the start of current block + int32_t rulesFirstLine = 0; // Line number of the start of current block for (charIdx = 0; charIdx < len; ) { status = U_ZERO_ERROR; diff --git a/icu4c/source/test/intltest/transrt.cpp b/icu4c/source/test/intltest/transrt.cpp index 7517577ff55..44266425ec4 100644 --- a/icu4c/source/test/intltest/transrt.cpp +++ b/icu4c/source/test/intltest/transrt.cpp @@ -1049,6 +1049,7 @@ static void writeStringInU8(FILE *out, const UnicodeString &s) { int32_t destIdx = 0; U8_APPEND(bufForOneChar, destIdx, (int32_t)sizeof(bufForOneChar), c, isError); U_ASSERT(!isError); + (void)isError; fwrite(bufForOneChar, 1, destIdx, out); } }