diff options
author | romankoshelev <romankoshelev@yandex-team.com> | 2023-08-14 19:51:50 +0300 |
---|---|---|
committer | romankoshelev <romankoshelev@yandex-team.com> | 2023-08-15 01:24:11 +0300 |
commit | cfcd865e05c0d0525ea27d1e153a043b32a85138 (patch) | |
tree | 68d3b3b25271e8a4998505897a269ff7ce119b76 /contrib/libs/icu/common/ucnvdisp.cpp | |
parent | ccb790c507bd5e8ffe2ef9886ce5ee0a7ce22a15 (diff) | |
download | ydb-cfcd865e05c0d0525ea27d1e153a043b32a85138.tar.gz |
Update ICU to 73.2
Diffstat (limited to 'contrib/libs/icu/common/ucnvdisp.cpp')
-rw-r--r-- | contrib/libs/icu/common/ucnvdisp.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/libs/icu/common/ucnvdisp.cpp b/contrib/libs/icu/common/ucnvdisp.cpp index ac86b98597..0830042d0b 100644 --- a/contrib/libs/icu/common/ucnvdisp.cpp +++ b/contrib/libs/icu/common/ucnvdisp.cpp @@ -35,25 +35,25 @@ U_CAPI int32_t U_EXPORT2 ucnv_getDisplayName(const UConverter *cnv, const char *displayLocale, - UChar *displayName, int32_t displayNameCapacity, + char16_t *displayName, int32_t displayNameCapacity, UErrorCode *pErrorCode) { UResourceBundle *rb; - const UChar *name; + const char16_t *name; int32_t length; UErrorCode localStatus = U_ZERO_ERROR; /* check arguments */ - if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) { + if(pErrorCode==nullptr || U_FAILURE(*pErrorCode)) { return 0; } - if(cnv==NULL || displayNameCapacity<0 || (displayNameCapacity>0 && displayName==NULL)) { + if(cnv==nullptr || displayNameCapacity<0 || (displayNameCapacity>0 && displayName==nullptr)) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } /* open the resource bundle and get the display name string */ - rb=ures_open(NULL, displayLocale, pErrorCode); + rb=ures_open(nullptr, displayLocale, pErrorCode); if(U_FAILURE(*pErrorCode)) { return 0; } |