ICU-57132.0.1.tar.gz

[apple/icu.git] / icuSources / common / ucnv2022.cpp

diff --git a/icuSources/common/ucnv2022.cpp b/icuSources/common/ucnv2022.cpp
index 2289e80c851c1aea5e5baf347f63c9b03be9f75e..7d4815dcb21690460553e39747facbb70818f369 100644 (file)
--- a/icuSources/common/ucnv2022.cpp
+++ b/icuSources/common/ucnv2022.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

-*   Copyright (C) 2000-2012, International Business Machines
+*   Copyright (C) 2000-2016, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  ucnv2022.cpp
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  ucnv2022.cpp


@@ -43,8 +43,6 @@
 #include "cmemory.h"
 #include "uassert.h"
 
 #include "cmemory.h"
 #include "uassert.h"
 

-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-

 #ifdef U_ENABLE_GENERIC_ISO_2022
 /*
  * I am disabling the generic ISO-2022 converter after proposing to do so on
 #ifdef U_ENABLE_GENERIC_ISO_2022
 /*
  * I am disabling the generic ISO-2022 converter after proposing to do so on


@@ -77,8 +75,10 @@
  */
 #endif
 
  */
 #endif
 

+#if !UCONFIG_ONLY_HTML_CONVERSION

 static const char SHIFT_IN_STR[]  = "\x0F";
 // static const char SHIFT_OUT_STR[] = "\x0E";
 static const char SHIFT_IN_STR[]  = "\x0F";
 // static const char SHIFT_OUT_STR[] = "\x0E";

+#endif

 
 #define CR      0x0D
 #define LF      0x0A
 
 #define CR      0x0D
 #define LF      0x0A


@@ -154,7 +154,11 @@ typedef enum  {
 } StateEnum;
 
 /* is the StateEnum charset value for a DBCS charset? */
 } StateEnum;
 
 /* is the StateEnum charset value for a DBCS charset? */

+#if UCONFIG_ONLY_HTML_CONVERSION
+#define IS_JP_DBCS(cs) (JISX208==(cs))
+#else

 #define IS_JP_DBCS(cs) (JISX208<=(cs) && (cs)<=KSC5601)
 #define IS_JP_DBCS(cs) (JISX208<=(cs) && (cs)<=KSC5601)

+#endif

 
 #define CSM(cs) ((uint16_t)1<<(cs))
 
 
 #define CSM(cs) ((uint16_t)1<<(cs))
 


@@ -167,13 +171,19 @@ typedef enum  {
  *   all versions, not just JIS7 and JIS8.
  * - ICU does not distinguish between different versions of JIS X 0208.
  */
  *   all versions, not just JIS7 and JIS8.
  * - ICU does not distinguish between different versions of JIS X 0208.
  */

+#if UCONFIG_ONLY_HTML_CONVERSION
+enum { MAX_JA_VERSION=0 };
+#else

 enum { MAX_JA_VERSION=4 };
 enum { MAX_JA_VERSION=4 };

+#endif

 static const uint16_t jpCharsetMasks[MAX_JA_VERSION+1]={
     CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT),
 static const uint16_t jpCharsetMasks[MAX_JA_VERSION+1]={
     CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT),

+#if !UCONFIG_ONLY_HTML_CONVERSION

     CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212),
     CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212)|CSM(GB2312)|CSM(KSC5601)|CSM(ISO8859_1)|CSM(ISO8859_7),
     CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212)|CSM(GB2312)|CSM(KSC5601)|CSM(ISO8859_1)|CSM(ISO8859_7),
     CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212)|CSM(GB2312)|CSM(KSC5601)|CSM(ISO8859_1)|CSM(ISO8859_7)
     CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212),
     CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212)|CSM(GB2312)|CSM(KSC5601)|CSM(ISO8859_1)|CSM(ISO8859_7),
     CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212)|CSM(GB2312)|CSM(KSC5601)|CSM(ISO8859_1)|CSM(ISO8859_7),
     CSM(ASCII)|CSM(JISX201)|CSM(JISX208)|CSM(HWKANA_7BIT)|CSM(JISX212)|CSM(GB2312)|CSM(KSC5601)|CSM(ISO8859_1)|CSM(ISO8859_7)

+#endif

 };
 
 typedef enum {
 };
 
 typedef enum {


@@ -360,15 +370,16 @@ static const int8_t escSeqStateTable_Value_2022[MAX_STATES_2022] = {
     ,VALID_TERMINAL_2022        ,VALID_TERMINAL_2022        ,VALID_TERMINAL_2022        ,VALID_TERMINAL_2022
 };
 
     ,VALID_TERMINAL_2022        ,VALID_TERMINAL_2022        ,VALID_TERMINAL_2022        ,VALID_TERMINAL_2022
 };
 

-

 /* Type def for refactoring changeState_2022 code*/
 typedef enum{
 #ifdef U_ENABLE_GENERIC_ISO_2022
     ISO_2022=0,
 #endif
     ISO_2022_JP=1,
 /* Type def for refactoring changeState_2022 code*/
 typedef enum{
 #ifdef U_ENABLE_GENERIC_ISO_2022
     ISO_2022=0,
 #endif
     ISO_2022_JP=1,

+#if !UCONFIG_ONLY_HTML_CONVERSION

     ISO_2022_KR=2,
     ISO_2022_CN=3
     ISO_2022_KR=2,
     ISO_2022_CN=3

+#endif

 } Variant2022;
 
 /*********** ISO 2022 Converter Protos ***********/
 } Variant2022;
 
 /*********** ISO 2022 Converter Protos ***********/


@@ -399,8 +410,11 @@ namespace {
 
 /*const UConverterSharedData _ISO2022Data;*/
 extern const UConverterSharedData _ISO2022JPData;
 
 /*const UConverterSharedData _ISO2022Data;*/
 extern const UConverterSharedData _ISO2022JPData;

+
+#if !UCONFIG_ONLY_HTML_CONVERSION

 extern const UConverterSharedData _ISO2022KRData;
 extern const UConverterSharedData _ISO2022CNData;
 extern const UConverterSharedData _ISO2022KRData;
 extern const UConverterSharedData _ISO2022CNData;

+#endif

 
 }  // namespace
 
 
 }  // namespace
 


@@ -479,11 +493,13 @@ _ISO2022Open(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){
         if(myLocale[0]=='j' && (myLocale[1]=='a'|| myLocale[1]=='p') &&
             (myLocale[2]=='_' || myLocale[2]=='\0'))
         {
         if(myLocale[0]=='j' && (myLocale[1]=='a'|| myLocale[1]=='p') &&
             (myLocale[2]=='_' || myLocale[2]=='\0'))
         {

-            size_t len=0;

             /* open the required converters and cache them */
             if(version>MAX_JA_VERSION) {
             /* open the required converters and cache them */
             if(version>MAX_JA_VERSION) {

-                /* prevent indexing beyond jpCharsetMasks[] */
-                myConverterData->version = version = 0;
+                // ICU 55 fails to open a converter for an unsupported version.
+                // Previously, it fell back to version 0, but that would yield
+                // unexpected behavior.
+                *errorCode = U_MISSING_RESOURCE_ERROR;
+                return;

             }
             if(jpCharsetMasks[version]&CSM(ISO8859_7)) {
                 myConverterData->myConverterArray[ISO8859_7] =
             }
             if(jpCharsetMasks[version]&CSM(ISO8859_7)) {
                 myConverterData->myConverterArray[ISO8859_7] =


@@ -509,13 +525,21 @@ _ISO2022Open(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){
             uprv_strcpy(myConverterData->locale,"ja");
 
             (void)uprv_strcpy(myConverterData->name,"ISO_2022,locale=ja,version=");
             uprv_strcpy(myConverterData->locale,"ja");
 
             (void)uprv_strcpy(myConverterData->name,"ISO_2022,locale=ja,version=");

-            len = uprv_strlen(myConverterData->name);
+            size_t len = uprv_strlen(myConverterData->name);

             myConverterData->name[len]=(char)(myConverterData->version+(int)'0');
             myConverterData->name[len+1]='\0';
         }
             myConverterData->name[len]=(char)(myConverterData->version+(int)'0');
             myConverterData->name[len+1]='\0';
         }

+#if !UCONFIG_ONLY_HTML_CONVERSION

         else if(myLocale[0]=='k' && (myLocale[1]=='o'|| myLocale[1]=='r') &&
             (myLocale[2]=='_' || myLocale[2]=='\0'))
         {
         else if(myLocale[0]=='k' && (myLocale[1]=='o'|| myLocale[1]=='r') &&
             (myLocale[2]=='_' || myLocale[2]=='\0'))
         {

+            if(version>1) {
+                // ICU 55 fails to open a converter for an unsupported version.
+                // Previously, it fell back to version 0, but that would yield
+                // unexpected behavior.
+                *errorCode = U_MISSING_RESOURCE_ERROR;
+                return;
+            }

             const char *cnvName;
             if(version==1) {
                 cnvName="icu-internal-25546";
             const char *cnvName;
             if(version==1) {
                 cnvName="icu-internal-25546";


@@ -555,6 +579,13 @@ _ISO2022Open(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){
         else if(((myLocale[0]=='z' && myLocale[1]=='h') || (myLocale[0]=='c'&& myLocale[1]=='n'))&&
             (myLocale[2]=='_' || myLocale[2]=='\0'))
         {
         else if(((myLocale[0]=='z' && myLocale[1]=='h') || (myLocale[0]=='c'&& myLocale[1]=='n'))&&
             (myLocale[2]=='_' || myLocale[2]=='\0'))
         {

+            if(version>2) {
+                // ICU 55 fails to open a converter for an unsupported version.
+                // Previously, it fell back to version 0, but that would yield
+                // unexpected behavior.
+                *errorCode = U_MISSING_RESOURCE_ERROR;
+                return;
+            }

 
             /* open the required converters and cache them */
             myConverterData->myConverterArray[GB2312_1] =
 
             /* open the required converters and cache them */
             myConverterData->myConverterArray[GB2312_1] =


@@ -582,6 +613,7 @@ _ISO2022Open(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){
                 (void)uprv_strcpy(myConverterData->name,"ISO_2022,locale=zh,version=2");
             }
         }
                 (void)uprv_strcpy(myConverterData->name,"ISO_2022,locale=zh,version=2");
             }
         }

+#endif  // !UCONFIG_ONLY_HTML_CONVERSION

         else{
 #ifdef U_ENABLE_GENERIC_ISO_2022
             myConverterData->isFirstBuffer = TRUE;
         else{
 #ifdef U_ENABLE_GENERIC_ISO_2022
             myConverterData->isFirstBuffer = TRUE;


@@ -596,7 +628,9 @@ _ISO2022Open(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){
             /* initialize the state variables */
             uprv_strcpy(myConverterData->name,"ISO_2022");
 #else
             /* initialize the state variables */
             uprv_strcpy(myConverterData->name,"ISO_2022");
 #else

-            *errorCode = U_UNSUPPORTED_ERROR;
+            *errorCode = U_MISSING_RESOURCE_ERROR;
+            // Was U_UNSUPPORTED_ERROR but changed in ICU 55 to a more standard
+            // data loading error code.

             return;
 #endif
         }
             return;
 #endif
         }


@@ -716,6 +750,7 @@ static const int8_t nextStateToUnicodeJP[MAX_STATES_2022]= {
     ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE
 };
 
     ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE
 };
 

+#if !UCONFIG_ONLY_HTML_CONVERSION

 /*************** to unicode *******************/
 static const int8_t nextStateToUnicodeCN[MAX_STATES_2022]= {
 /*      0                1               2               3               4               5               6               7               8               9    */
 /*************** to unicode *******************/
 static const int8_t nextStateToUnicodeCN[MAX_STATES_2022]= {
 /*      0                1               2               3               4               5               6               7               8               9    */


@@ -728,6 +763,7 @@ static const int8_t nextStateToUnicodeCN[MAX_STATES_2022]= {
     ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE
     ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE
 };
     ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE
     ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE  ,INVALID_STATE
 };

+#endif

 
 
 static UCNV_TableStates_2022
 
 
 static UCNV_TableStates_2022


@@ -748,7 +784,7 @@ getKey_2022(char c,int32_t* key,int32_t* offset){
 
     while (hi != low)  /*binary search*/{
 
 
     while (hi != low)  /*binary search*/{
 

-        register int32_t mid = (hi+low) >> 1; /*Finds median*/
+        int32_t mid = (hi+low) >> 1; /*Finds median*/

 
         if (mid == oldmid)
             break;
 
         if (mid == oldmid)
             break;


@@ -900,6 +936,7 @@ DONE:
                 }
             }
             break;
                 }
             }
             break;

+#if !UCONFIG_ONLY_HTML_CONVERSION

         case ISO_2022_CN:
             {
                 StateEnum tempState=(StateEnum)nextStateToUnicodeCN[offset];
         case ISO_2022_CN:
             {
                 StateEnum tempState=(StateEnum)nextStateToUnicodeCN[offset];


@@ -934,9 +971,9 @@ DONE:
                         *err = U_UNSUPPORTED_ESCAPE_SEQUENCE;
                         break;
                     }
                         *err = U_UNSUPPORTED_ESCAPE_SEQUENCE;
                         break;
                     }

-                    /*fall through*/
+                    U_FALLTHROUGH;

                 case GB2312_1:
                 case GB2312_1:

-                    /*fall through*/
+                    U_FALLTHROUGH;

                 case CNS_11643_1:
                     myData2022->toU2022State.cs[1]=(int8_t)tempState;
                     break;
                 case CNS_11643_1:
                     myData2022->toU2022State.cs[1]=(int8_t)tempState;
                     break;


@@ -961,6 +998,7 @@ DONE:
                 *err = U_UNSUPPORTED_ESCAPE_SEQUENCE;
             }
             break;
                 *err = U_UNSUPPORTED_ESCAPE_SEQUENCE;
             }
             break;

+#endif  // !UCONFIG_ONLY_HTML_CONVERSION

 
         default:
             *err = U_ILLEGAL_ESCAPE_SEQUENCE;
 
         default:
             *err = U_ILLEGAL_ESCAPE_SEQUENCE;


@@ -1003,6 +1041,7 @@ DONE:
     }
 }
 
     }
 }
 

+#if !UCONFIG_ONLY_HTML_CONVERSION

 /*Checks the characters of the buffer against valid 2022 escape sequences
 *if the match we return a pointer to the initial start of the sequence otherwise
 *we return sourceLimit
 /*Checks the characters of the buffer against valid 2022 escape sequences
 *if the match we return a pointer to the initial start of the sequence otherwise
 *we return sourceLimit


@@ -1057,7 +1096,7 @@ getEndOfBuffer_2022(const char** source,
     return mySource;
 #endif
 }
     return mySource;
 #endif
 }

-
+#endif

 
 /* This inline function replicates code in _MBCSFromUChar32() function in ucnvmbcs.c
  * any future change in _MBCSFromUChar32() function should be reflected here.
 
 /* This inline function replicates code in _MBCSFromUChar32() function in ucnvmbcs.c
  * any future change in _MBCSFromUChar32() function should be reflected here.


@@ -1382,8 +1421,8 @@ static const StateEnum jpCharsetPref[]={
     ASCII,
     JISX201,
     ISO8859_1,
     ASCII,
     JISX201,
     ISO8859_1,

-    ISO8859_7,

     JISX208,
     JISX208,

+    ISO8859_7,

     JISX212,
     GB2312,
     KSC5601,
     JISX212,
     GB2312,
     KSC5601,


@@ -1719,7 +1758,7 @@ getTrail:
                 }
 
                 /* try all the other possible charsets */
                 }
 
                 /* try all the other possible charsets */

-                for(i = 0; i < LENGTHOF(jpCharsetPref); ++i) {
+                for(i = 0; i < UPRV_LENGTHOF(jpCharsetPref); ++i) {

                     cs = (int8_t)jpCharsetPref[i];
                     if(CSM(cs) & csm) {
                         choices[choiceCount++] = cs;
                     cs = (int8_t)jpCharsetPref[i];
                     if(CSM(cs) & csm) {
                         choices[choiceCount++] = cs;


@@ -2121,7 +2160,6 @@ escape:
             /* ISO-2022-JP does not use single-byte (C1) SS2 and SS3 */
 
             case CR:
             /* ISO-2022-JP does not use single-byte (C1) SS2 and SS3 */
 
             case CR:

-                /*falls through*/

             case LF:
                 /* automatically reset to single-byte mode */
                 if((StateEnum)pToU2022State->cs[0] != ASCII && (StateEnum)pToU2022State->cs[0] != JISX201) {
             case LF:
                 /* automatically reset to single-byte mode */
                 if((StateEnum)pToU2022State->cs[0] != ASCII && (StateEnum)pToU2022State->cs[0] != JISX201) {


@@ -2129,7 +2167,7 @@ escape:
                 }
                 pToU2022State->cs[2] = 0;
                 pToU2022State->g = 0;
                 }
                 pToU2022State->cs[2] = 0;
                 pToU2022State->g = 0;

-                /* falls through */
+                U_FALLTHROUGH;

             default:
                 /* convert one or two bytes */
                 myData->isEmptySegment = FALSE;
             default:
                 /* convert one or two bytes */
                 myData->isEmptySegment = FALSE;


@@ -2271,6 +2309,7 @@ endloop:
 }
 
 
 }
 
 

+#if !UCONFIG_ONLY_HTML_CONVERSION

 /***************************************************************
 *   Rules for ISO-2022-KR encoding
 *   i) The KSC5601 designator sequence should appear only once in a file,
 /***************************************************************
 *   Rules for ISO-2022-KR encoding
 *   i) The KSC5601 designator sequence should appear only once in a file,


@@ -3303,10 +3342,9 @@ escape:
             /* ISO-2022-CN does not use single-byte (C1) SS2 and SS3 */
 
             case CR:
             /* ISO-2022-CN does not use single-byte (C1) SS2 and SS3 */
 
             case CR:

-                /*falls through*/

             case LF:
                 uprv_memset(pToU2022State, 0, sizeof(ISO2022State));
             case LF:
                 uprv_memset(pToU2022State, 0, sizeof(ISO2022State));

-                /* falls through */
+                U_FALLTHROUGH;

             default:
                 /* convert one or two bytes */
                 myData->isEmptySegment = FALSE;
             default:
                 /* convert one or two bytes */
                 myData->isEmptySegment = FALSE;


@@ -3414,6 +3452,7 @@ endloop:
     args->target = myTarget;
     args->source = mySource;
 }
     args->target = myTarget;
     args->source = mySource;
 }

+#endif /* #if !UCONFIG_ONLY_HTML_CONVERSION */

 
 static void
 _ISO_2022_WriteSub(UConverterFromUnicodeArgs *args, int32_t offsetIndex, UErrorCode *err) {
 
 static void
 _ISO_2022_WriteSub(UConverterFromUnicodeArgs *args, int32_t offsetIndex, UErrorCode *err) {


@@ -3640,6 +3679,7 @@ _ISO_2022_GetUnicodeSet(const UConverter *cnv,
             sa->addRange(sa->set, HWKANA_START, HWKANA_END);
         }
         break;
             sa->addRange(sa->set, HWKANA_START, HWKANA_END);
         }
         break;

+#if !UCONFIG_ONLY_HTML_CONVERSION

     case 'c':
     case 'z':
         /* include ASCII for CN */
     case 'c':
     case 'z':
         /* include ASCII for CN */


@@ -3651,6 +3691,7 @@ _ISO_2022_GetUnicodeSet(const UConverter *cnv,
                 cnvData->currentConverter, sa, which, pErrorCode);
         /* the loop over myConverterArray[] will simply not find another converter */
         break;
                 cnvData->currentConverter, sa, which, pErrorCode);
         /* the loop over myConverterArray[] will simply not find another converter */
         break;

+#endif

     default:
         break;
     }
     default:
         break;
     }


@@ -3671,9 +3712,15 @@ _ISO_2022_GetUnicodeSet(const UConverter *cnv,
     for (i=0; i<UCNV_2022_MAX_CONVERTERS; i++) {
         UConverterSetFilter filter;
         if(cnvData->myConverterArray[i]!=NULL) {
     for (i=0; i<UCNV_2022_MAX_CONVERTERS; i++) {
         UConverterSetFilter filter;
         if(cnvData->myConverterArray[i]!=NULL) {

-            if( (cnvData->locale[0]=='c' || cnvData->locale[0]=='z') &&
-                cnvData->version==0 && i==CNS_11643
-            ) {
+            if(cnvData->locale[0]=='j' && i==JISX208) {
+                /*
+                 * Only add code points that map to Shift-JIS codes
+                 * corresponding to JIS X 0208.
+                 */
+                filter=UCNV_SET_FILTER_SJIS;
+#if !UCONFIG_ONLY_HTML_CONVERSION
+            } else if( (cnvData->locale[0]=='c' || cnvData->locale[0]=='z') &&
+                       cnvData->version==0 && i==CNS_11643) {

                 /*
                  * Version-specific for CN:
                  * CN version 0 does not map CNS planes 3..7 although
                 /*
                  * Version-specific for CN:
                  * CN version 0 does not map CNS planes 3..7 although


@@ -3682,18 +3729,13 @@ _ISO_2022_GetUnicodeSet(const UConverter *cnv,
                  * The two versions create different Unicode sets.
                  */
                 filter=UCNV_SET_FILTER_2022_CN;
                  * The two versions create different Unicode sets.
                  */
                 filter=UCNV_SET_FILTER_2022_CN;

-            } else if(cnvData->locale[0]=='j' && i==JISX208) {
-                /*
-                 * Only add code points that map to Shift-JIS codes
-                 * corresponding to JIS X 0208.
-                 */
-                filter=UCNV_SET_FILTER_SJIS;

             } else if(i==KSC5601) {
                 /*
                  * Some of the KSC 5601 tables (convrtrs.txt has this aliases on multiple tables)
                  * are broader than GR94.
                  */
                 filter=UCNV_SET_FILTER_GR94DBCS;
             } else if(i==KSC5601) {
                 /*
                  * Some of the KSC 5601 tables (convrtrs.txt has this aliases on multiple tables)
                  * are broader than GR94.
                  */
                 filter=UCNV_SET_FILTER_GR94DBCS;

+#endif

             } else {
                 filter=UCNV_SET_FILTER_NONE;
             }
             } else {
                 filter=UCNV_SET_FILTER_NONE;
             }


@@ -3762,16 +3804,8 @@ static const UConverterStaticData _ISO2022StaticData={
     0,
     { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } /* reserved */
 };
     0,
     { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } /* reserved */
 };

-const UConverterSharedData _ISO2022Data={
-    sizeof(UConverterSharedData),
-    ~((uint32_t) 0),
-    NULL,
-    NULL,
-    &_ISO2022StaticData,
-    FALSE,
-    &_ISO2022Impl,
-    0, UCNV_MBCS_TABLE_INITIALIZER
-};
+const UConverterSharedData _ISO2022Data=
+        UCNV_IMMUTABLE_SHARED_DATA_INITIALIZER(&_ISO2022StaticData, &_ISO2022Impl);

 
 /*************JP****************/
 static const UConverterImpl _ISO2022JPImpl={
 
 /*************JP****************/
 static const UConverterImpl _ISO2022JPImpl={


@@ -3818,19 +3852,12 @@ static const UConverterStaticData _ISO2022JPStaticData={
 
 namespace {
 
 
 namespace {
 

-const UConverterSharedData _ISO2022JPData={
-    sizeof(UConverterSharedData),
-    ~((uint32_t) 0),
-    NULL,
-    NULL,
-    &_ISO2022JPStaticData,
-    FALSE,
-    &_ISO2022JPImpl,
-    0, UCNV_MBCS_TABLE_INITIALIZER
-};
+const UConverterSharedData _ISO2022JPData=
+        UCNV_IMMUTABLE_SHARED_DATA_INITIALIZER(&_ISO2022JPStaticData, &_ISO2022JPImpl);

 
 }  // namespace
 
 
 }  // namespace
 

+#if !UCONFIG_ONLY_HTML_CONVERSION

 /************* KR ***************/
 static const UConverterImpl _ISO2022KRImpl={
     UCNV_ISO_2022,
 /************* KR ***************/
 static const UConverterImpl _ISO2022KRImpl={
     UCNV_ISO_2022,


@@ -3864,7 +3891,7 @@ static const UConverterStaticData _ISO2022KRStaticData={
     UCNV_IBM,
     UCNV_ISO_2022,
     1,
     UCNV_IBM,
     UCNV_ISO_2022,
     1,

-    3, /* max 3 bytes per UChar: SO+DBCS */
+    8, /* max 8 bytes per UChar */

     { 0x1a, 0, 0, 0 },
     1,
     FALSE,
     { 0x1a, 0, 0, 0 },
     1,
     FALSE,


@@ -3876,16 +3903,8 @@ static const UConverterStaticData _ISO2022KRStaticData={
 
 namespace {
 
 
 namespace {
 

-const UConverterSharedData _ISO2022KRData={
-    sizeof(UConverterSharedData),
-    ~((uint32_t) 0),
-    NULL,
-    NULL,
-    &_ISO2022KRStaticData,
-    FALSE,
-    &_ISO2022KRImpl,
-    0, UCNV_MBCS_TABLE_INITIALIZER
-};
+const UConverterSharedData _ISO2022KRData=
+        UCNV_IMMUTABLE_SHARED_DATA_INITIALIZER(&_ISO2022KRStaticData, &_ISO2022KRImpl);

 
 }  // namespace
 
 
 }  // namespace
 


@@ -3935,17 +3954,10 @@ static const UConverterStaticData _ISO2022CNStaticData={
 
 namespace {
 
 
 namespace {
 

-const UConverterSharedData _ISO2022CNData={
-    sizeof(UConverterSharedData),
-    ~((uint32_t) 0),
-    NULL,
-    NULL,
-    &_ISO2022CNStaticData,
-    FALSE,
-    &_ISO2022CNImpl,
-    0, UCNV_MBCS_TABLE_INITIALIZER
-};
+const UConverterSharedData _ISO2022CNData=
+        UCNV_IMMUTABLE_SHARED_DATA_INITIALIZER(&_ISO2022CNStaticData, &_ISO2022CNImpl);

 
 }  // namespace
 
 }  // namespace

+#endif /* #if !UCONFIG_ONLY_HTML_CONVERSION */

 
 #endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */
 
 #endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */