Update ICU to 54.1 step 1

source/tools/toolutil/swapimpl.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2005-2012, International Business Machines
+*   Copyright (C) 2005-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  swapimpl.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2005may05
 *   created by: Markus W. Scherer
@@ skipping 45 matching lines @@
 /* swapping implementations in i18n */
 
 #if !UCONFIG_NO_NORMALIZATION
 #include "uspoof_impl.h"
 #endif
 
 U_NAMESPACE_USE
 
 /* definitions */
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 /* Unicode property (value) aliases data swapping --------------------------- */
 
 static int32_t U_CALLCONV
 upname_swap(const UDataSwapper *ds,
             const void *inData, int32_t length, void *outData,
             UErrorCode *pErrorCode) {
     /* udata_swapDataHeader checks the arguments */
     int32_t headerSize=udata_swapDataHeader(ds, inData, length, outData, pErrorCode);
     if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
         return 0;
@@ skipping 411 matching lines @@
         /* swap the UTrie */
         count=indexes[UBIDI_IX_TRIE_SIZE];
         utrie2_swapAnyVersion(ds, inBytes+offset, count, outBytes+offset, pErrorCode);
         offset+=count;
 
         /* swap the uint32_t mirrors[] */
         count=indexes[UBIDI_IX_MIRROR_LENGTH]*4;
         ds->swapArray32(ds, inBytes+offset, count, outBytes+offset, pErrorCode);
         offset+=count;
 
-        /* just skip the uint8_t jgArray[] */
+        /* just skip the uint8_t jgArray[] and jgArray2[] */
         count=indexes[UBIDI_IX_JG_LIMIT]-indexes[UBIDI_IX_JG_START];
         offset+=count;
+        count=indexes[UBIDI_IX_JG_LIMIT2]-indexes[UBIDI_IX_JG_START2];
+        offset+=count;
 
         U_ASSERT(offset==size);
     }
 
     return headerSize+size;
 }
 
 /* Unicode normalization data swapping -------------------------------------- */
 
 #if !UCONFIG_NO_NORMALIZATION
@@ skipping 267 matching lines @@
         };
 
         if(uprv_isInvariantUString(u, 4)) {
             u_UCharsToChars(u, dataFormatChars, 4);
         } else {
             dataFormatChars[0]=dataFormatChars[1]=dataFormatChars[2]=dataFormatChars[3]='?';
         }
     }
 
     /* dispatch to the swap function for the dataFormat */
-    for(i=0; i<LENGTHOF(swapFns); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(swapFns); ++i) {
         if(0==memcmp(swapFns[i].dataFormat, pInfo->dataFormat, 4)) {
             swappedLength=swapFns[i].swapFn(ds, inData, length, outData, pErrorCode);
 
             if(U_FAILURE(*pErrorCode)) {
                 udata_printError(ds, "udata_swap(): failure swapping data format %02x.%02x.%02x.%02x (\"%c%c%c%c\") - %s\n",
                                  pInfo->dataFormat[0], pInfo->dataFormat[1],
                                  pInfo->dataFormat[2], pInfo->dataFormat[3],
                                  dataFormatChars[0], dataFormatChars[1],
                                  dataFormatChars[2], dataFormatChars[3],
                                  u_errorName(*pErrorCode));
@@ skipping 15 matching lines @@
     /* the dataFormat was not recognized */
     udata_printError(ds, "udata_swap(): unknown data format %02x.%02x.%02x.%02x (\"%c%c%c%c\")\n",
                      pInfo->dataFormat[0], pInfo->dataFormat[1],
                      pInfo->dataFormat[2], pInfo->dataFormat[3],
                      dataFormatChars[0], dataFormatChars[1],
                      dataFormatChars[2], dataFormatChars[3]);
 
     *pErrorCode=U_UNSUPPORTED_ERROR;
     return 0;
 }