diff --git a/Libraries/LibUnicode/ICU.h b/Libraries/LibUnicode/ICU.h index 35a562c7faf..9f2126751fb 100644 --- a/Libraries/LibUnicode/ICU.h +++ b/Libraries/LibUnicode/ICU.h @@ -118,7 +118,7 @@ Vector icu_string_enumeration_to_list(OwnPtr enu if (icu_failure(status) || value == nullptr) break; - if (!filter(value)) + if (!filter(value, static_cast(length))) continue; if (bcp47_keyword) { @@ -134,7 +134,7 @@ Vector icu_string_enumeration_to_list(OwnPtr enu ALWAYS_INLINE Vector icu_string_enumeration_to_list(OwnPtr enumeration, char const* bcp47_keyword) { - return icu_string_enumeration_to_list(move(enumeration), bcp47_keyword, [](char const*) { return true; }); + return icu_string_enumeration_to_list(move(enumeration), bcp47_keyword, [](char const*, size_t) { return true; }); } } diff --git a/Libraries/LibUnicode/TimeZone.cpp b/Libraries/LibUnicode/TimeZone.cpp index 3a4409a5481..dcb92c29a32 100644 --- a/Libraries/LibUnicode/TimeZone.cpp +++ b/Libraries/LibUnicode/TimeZone.cpp @@ -107,8 +107,8 @@ static Vector icu_available_time_zones(Optional const& regio if (icu_failure(status)) return { "UTC"_string }; - auto time_zones = icu_string_enumeration_to_list(move(time_zone_enumerator), nullptr, [](char const* zone) { - return !is_legacy_non_iana_time_zone({ zone, strlen(zone) }); + auto time_zones = icu_string_enumeration_to_list(move(time_zone_enumerator), nullptr, [](char const* zone, size_t zone_length) { + return !is_legacy_non_iana_time_zone({ zone, zone_length }); }); quick_sort(time_zones); diff --git a/Libraries/LibUnicode/UnicodeKeywords.cpp b/Libraries/LibUnicode/UnicodeKeywords.cpp index 519b036fe4e..fec6d4a006d 100644 --- a/Libraries/LibUnicode/UnicodeKeywords.cpp +++ b/Libraries/LibUnicode/UnicodeKeywords.cpp @@ -153,7 +153,7 @@ Vector const& available_number_systems() if (icu_failure(status)) return {}; - auto number_systems = icu_string_enumeration_to_list(move(keywords), "nu", [&](char const* keyword) { + auto number_systems = icu_string_enumeration_to_list(move(keywords), "nu", [&](char const* keyword, size_t) { auto system = adopt_own_if_nonnull(icu::NumberingSystem::createInstanceByName(keyword, status)); if (icu_failure(status)) return false;