Update ICU to 54.1 step 1

source/common/ucnvhz.c

 /*  
 **********************************************************************
-*   Copyright (C) 2000-2011, International Business Machines
+*   Copyright (C) 2000-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  ucnvhz.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2000oct16
 *   created by: Ram Viswanadha
 *   10/31/2000  Ram     Implemented offsets logic function
 *   
 */
 
 #include "unicode/utypes.h"
 
-#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION
 
 #include "cmemory.h"
 #include "unicode/ucnv.h"
 #include "unicode/ucnv_cb.h"
 #include "unicode/uset.h"
 #include "unicode/utf16.h"
 #include "ucnv_bld.h"
 #include "ucnv_cnv.h"
 #include "ucnv_imp.h"
 
@@ skipping 303 matching lines @@
 static void 
 UConverter_fromUnicode_HZ_OFFSETS_LOGIC (UConverterFromUnicodeArgs * args,
                                                       UErrorCode * err){
     const UChar *mySource = args->source;
     char *myTarget = args->target;
     int32_t* offsets = args->offsets;
     int32_t mySourceIndex = 0;
     int32_t myTargetIndex = 0;
     int32_t targetLength = (int32_t)(args->targetLimit - myTarget);
     int32_t mySourceLength = (int32_t)(args->sourceLimit - args->source);
-    int32_t length=0;
     uint32_t targetUniChar = 0x0000;
     UChar32 mySourceChar = 0x0000;
     UConverterDataHZ *myConverterData=(UConverterDataHZ*)args->converter->extraInfo;
     UBool isTargetUCharDBCS = (UBool) myConverterData->isTargetUCharDBCS;
-    UBool oldIsTargetUCharDBCS = isTargetUCharDBCS;
+    UBool oldIsTargetUCharDBCS;
     int len =0;
     const char* escSeq=NULL;
     
     /* Calling code already handles this situation. */
     /*if ((args->converter == NULL) || (args->targetLimit < myTarget) || (args->sourceLimit < args->source)){
         *err = U_ILLEGAL_ARGUMENT_ERROR;
         return;
     }*/
     if(args->converter->fromUChar32!=0 && myTargetIndex < targetLength) {
         goto getTrail;
     }
     /*writing the char to the output stream */
     while (mySourceIndex < mySourceLength){
         targetUniChar = missingCharMarker;
         if (myTargetIndex < targetLength){
             
             mySourceChar = (UChar) mySource[mySourceIndex++];
             
 
             oldIsTargetUCharDBCS = isTargetUCharDBCS;
             if(mySourceChar ==UCNV_TILDE){
                 /*concatEscape(args, &myTargetIndex, &targetLength,"\x7E\x7E",err,2,&mySourceIndex);*/
                 len = ESC_LEN;
                 escSeq = TILDE_ESCAPE;
                 CONCAT_ESCAPE_MACRO(args, myTargetIndex, targetLength, escSeq,err,len,mySourceIndex);
                 continue;
             } else if(mySourceChar <= 0x7f) {
-                length = 1;
                 targetUniChar = mySourceChar;
             } else {
-                length= ucnv_MBCSFromUChar32(myConverterData->gbConverter->sharedData,
+                int32_t length= ucnv_MBCSFromUChar32(myConverterData->gbConverter->sharedData,
                     mySourceChar,&targetUniChar,args->converter->useFallback);
                 /* we can only use lead bytes 21..7D and trail bytes 21..7E */
                 if( length == 2 &&
                     (uint16_t)(targetUniChar - 0xa1a1) <= (0xfdfe - 0xa1a1) &&
                     (uint8_t)(targetUniChar - 0xa1) <= (0xfe - 0xa1)
                 ) {
                     targetUniChar -= 0x8080;
                 } else {
                     targetUniChar = missingCharMarker;
                 }
@@ skipping 240 matching lines @@
     sizeof(UConverterSharedData),
         ~((uint32_t) 0),
         NULL, 
         NULL, 
         &_HZStaticData, 
         FALSE, 
         &_HZImpl, 
         0
 };
 
-#endif /* #if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_NO_NON_HTML5_CONVERSION */
+#endif /* #if !UCONFIG_NO_LEGACY_CONVERSION */