Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1470)

Unified Diff: source/common/ucnv_u8.c

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/common/ucnv_u7.c ('k') | source/common/ucnvbocu.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/ucnv_u8.c
diff --git a/source/common/ucnv_u8.c b/source/common/ucnv_u8.c
index 24205f5a6115d046dde0e71856ff0e612c7b8309..8ee9fe54764cde6709bd9ac39ccc13d13319e37f 100644
--- a/source/common/ucnv_u8.c
+++ b/source/common/ucnv_u8.c
@@ -87,15 +87,6 @@ static const int8_t bytesFromUTF8[256] = {
static const uint32_t
utf8_minChar32[7]={ 0, 0, 0x80, 0x800, 0x10000, 0xffffffff, 0xffffffff };
-static UBool hasCESU8Data(const UConverter *cnv)
-{
-#if UCONFIG_NO_NON_HTML5_CONVERSION
- return FALSE;
-#else
- return (UBool)(cnv->sharedData == &_CESU8Data);
-#endif
-}
-
static void ucnv_toUnicode_UTF8 (UConverterToUnicodeArgs * args,
UErrorCode * err)
{
@@ -105,10 +96,10 @@ static void ucnv_toUnicode_UTF8 (UConverterToUnicodeArgs * args,
const unsigned char *sourceLimit = (unsigned char *) args->sourceLimit;
const UChar *targetLimit = args->targetLimit;
unsigned char *toUBytes = cnv->toUBytes;
- UBool isCESU8 = hasCESU8Data(cnv);
+ UBool isCESU8 = (UBool)(cnv->sharedData == &_CESU8Data);
uint32_t ch, ch2 = 0;
int32_t i, inBytes;
-
+
/* Restore size of current sequence */
if (cnv->toUnicodeStatus && myTarget < targetLimit)
{
@@ -235,7 +226,7 @@ static void ucnv_toUnicode_UTF8_OFFSETS_LOGIC (UConverterToUnicodeArgs * args,
const unsigned char *sourceLimit = (unsigned char *) args->sourceLimit;
const UChar *targetLimit = args->targetLimit;
unsigned char *toUBytes = cnv->toUBytes;
- UBool isCESU8 = hasCESU8Data(cnv);
+ UBool isCESU8 = (UBool)(cnv->sharedData == &_CESU8Data);
uint32_t ch, ch2 = 0;
int32_t i, inBytes;
@@ -366,7 +357,7 @@ U_CFUNC void ucnv_fromUnicode_UTF8 (UConverterFromUnicodeArgs * args,
UChar32 ch;
uint8_t tempBuf[4];
int32_t indexToWrite;
- UBool isNotCESU8 = !hasCESU8Data(cnv);
+ UBool isNotCESU8 = (UBool)(cnv->sharedData != &_CESU8Data);
if (cnv->fromUChar32 && myTarget < targetLimit)
{
@@ -482,7 +473,7 @@ U_CFUNC void ucnv_fromUnicode_UTF8_OFFSETS_LOGIC (UConverterFromUnicodeArgs * ar
int32_t offsetNum, nextSourceIndex;
int32_t indexToWrite;
uint8_t tempBuf[4];
- UBool isNotCESU8 = !hasCESU8Data(cnv);
+ UBool isNotCESU8 = (UBool)(cnv->sharedData != &_CESU8Data);
if (cnv->fromUChar32 && myTarget < targetLimit)
{
« no previous file with comments | « source/common/ucnv_u7.c ('k') | source/common/ucnvbocu.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698