ICUCtypeData: Use U16_APPEND rather than implementing our own version.
This commit is contained in:
@@ -369,15 +369,11 @@ ICUCtypeData::WcharToMultibyte(char* mbOut, wchar_t wc, mbstate_t* mbState,
|
|||||||
|
|
||||||
// convert input from UTF-32 to UTF-16
|
// convert input from UTF-32 to UTF-16
|
||||||
UChar ucharBuffer[2];
|
UChar ucharBuffer[2];
|
||||||
size_t ucharLength;
|
UBool isError = false;
|
||||||
if (U_IS_BMP(wc)) {
|
size_t ucharLength = 0;
|
||||||
ucharBuffer[0] = wc;
|
U16_APPEND(ucharBuffer, ucharLength, sizeof(ucharBuffer), wc, isError);
|
||||||
ucharLength = 1;
|
if (isError)
|
||||||
} else {
|
return B_BAD_VALUE;
|
||||||
ucharBuffer[0] = U16_LEAD(wc);
|
|
||||||
ucharBuffer[1] = U16_TRAIL(wc);
|
|
||||||
ucharLength = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
// do the actual conversion
|
// do the actual conversion
|
||||||
UErrorCode icuStatus = U_ZERO_ERROR;
|
UErrorCode icuStatus = U_ZERO_ERROR;
|
||||||
|
|||||||
Reference in New Issue
Block a user