Update ICU to 54.1 step 1

source/common/ucnv_u8.c

 /*  
 **********************************************************************
 *   Copyright (C) 2002-2012, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  ucnv_u8.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
@@ skipping 69 matching lines @@
 
 /*
  * Starting with Unicode 3.0.1:
  * UTF-8 byte sequences of length N _must_ encode code points of or above utf8_minChar32[N];
  * byte sequences with more than 4 bytes are illegal in UTF-8,
  * which is tested with impossible values for them
  */
 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)
 {
     UConverter *cnv = args->converter;
     const unsigned char *mySource = (unsigned char *) args->source;
     UChar *myTarget = args->target;
     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)
     {
         inBytes = cnv->mode;            /* restore # of bytes to consume */
         i = cnv->toULength;             /* restore # of bytes consumed */
         cnv->toULength = 0;
 
         ch = cnv->toUnicodeStatus;/*Stores the previously calculated ch from a previous call*/
         cnv->toUnicodeStatus = 0;
         goto morebytes;
@@ skipping 106 matching lines @@
                                                 UErrorCode * err)
 {
     UConverter *cnv = args->converter;
     const unsigned char *mySource = (unsigned char *) args->source;
     UChar *myTarget = args->target;
     int32_t *myOffsets = args->offsets;
     int32_t offsetNum = 0;
     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)
     {
         inBytes = cnv->mode;            /* restore # of bytes to consume */
         i = cnv->toULength;             /* restore # of bytes consumed */
         cnv->toULength = 0;
 
@@ skipping 110 matching lines @@
 {
     UConverter *cnv = args->converter;
     const UChar *mySource = args->source;
     const UChar *sourceLimit = args->sourceLimit;
     uint8_t *myTarget = (uint8_t *) args->target;
     const uint8_t *targetLimit = (uint8_t *) args->targetLimit;
     uint8_t *tempPtr;
     UChar32 ch;
     uint8_t tempBuf[4];
     int32_t indexToWrite;
-    UBool isNotCESU8 = !hasCESU8Data(cnv);
+    UBool isNotCESU8 = (UBool)(cnv->sharedData != &_CESU8Data);
 
     if (cnv->fromUChar32 && myTarget < targetLimit)
     {
         ch = cnv->fromUChar32;
         cnv->fromUChar32 = 0;
         goto lowsurrogate;
     }
 
     while (mySource < sourceLimit && myTarget < targetLimit)
     {
@@ skipping 95 matching lines @@
     const UChar *mySource = args->source;
     int32_t *myOffsets = args->offsets;
     const UChar *sourceLimit = args->sourceLimit;
     uint8_t *myTarget = (uint8_t *) args->target;
     const uint8_t *targetLimit = (uint8_t *) args->targetLimit;
     uint8_t *tempPtr;
     UChar32 ch;
     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)
     {
         ch = cnv->fromUChar32;
         cnv->fromUChar32 = 0;
         offsetNum = -1;
         nextSourceIndex = 0;
         goto lowsurrogate;
     } else {
         offsetNum = 0;
@@ skipping 590 matching lines @@
 };
 
 
 const UConverterSharedData _CESU8Data={
     sizeof(UConverterSharedData), ~((uint32_t) 0),
     NULL, NULL, &_CESU8StaticData, FALSE, &_CESU8Impl,
     0
 };
 
 #endif