diff --git a/icu4c/source/common/uiter.cpp b/icu4c/source/common/uiter.cpp index d7a1048660..e77f12616c 100644 --- a/icu4c/source/common/uiter.cpp +++ b/icu4c/source/common/uiter.cpp @@ -25,22 +25,22 @@ U_CDECL_BEGIN /* No-Op UCharIterator implementation for illegal input --------------------- */ static int32_t U_CALLCONV -noopGetIndex(UCharIterator *iter, UCharIteratorOrigin origin) { +noopGetIndex(UCharIterator * /*iter*/, UCharIteratorOrigin /*origin*/) { return 0; } static int32_t U_CALLCONV -noopMove(UCharIterator *iter, int32_t delta, UCharIteratorOrigin origin) { +noopMove(UCharIterator * /*iter*/, int32_t /*delta*/, UCharIteratorOrigin /*origin*/) { return 0; } static UBool U_CALLCONV -noopHasNext(UCharIterator *iter) { +noopHasNext(UCharIterator * /*iter*/) { return FALSE; } static int32_t U_CALLCONV -noopCurrent(UCharIterator *iter) { +noopCurrent(UCharIterator * /*iter*/) { return -1; } diff --git a/icu4c/source/common/uloc.c b/icu4c/source/common/uloc.c index d305132d9d..0fb02b02ac 100644 --- a/icu4c/source/common/uloc.c +++ b/icu4c/source/common/uloc.c @@ -803,15 +803,15 @@ uloc_getLCID(const char* localeID) if (U_SUCCESS(err)) { - UResourceBundle *localeID = ures_getByKey(bundle, _kLocaleID, NULL, &err); + UResourceBundle *resLocaleID = ures_getByKey(bundle, _kLocaleID, NULL, &err); if (U_SUCCESS(err)) { - result = ures_getInt(localeID, &err); + result = ures_getInt(resLocaleID, &err); if (U_FAILURE(err)) { result = 0; } - ures_close(localeID); + ures_close(resLocaleID); } ures_close(bundle); }