Update ICU to 54.1 step 1

source/tools/makeconv/gencnvex.c

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2003-2013, International Business Machines
+*   Copyright (C) 2003-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  gencnvex.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2003oct12
 *   created by: Markus W. Scherer
 */
 
 #include <stdio.h>
 #include "unicode/utypes.h"
 #include "unicode/ustring.h"
 #include "cstring.h"
 #include "cmemory.h"
 #include "ucnv_cnv.h"
 #include "ucnvmbcs.h"
 #include "toolutil.h"
 #include "unewdata.h"
 #include "ucm.h"
 #include "makeconv.h"
 #include "genmbcs.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
-
 static void
 CnvExtClose(NewConverter *cnvData);
 
 static UBool
 CnvExtIsValid(NewConverter *cnvData,
               const uint8_t *bytes, int32_t length);
 
 static UBool
 CnvExtAddTable(NewConverter *cnvData, UCMTable *table, UConverterStaticData *staticData);
 
@@ skipping 799 matching lines @@
     if(extData->stage1[i1]==0) {
         /* allocate another block in stage 2; overlap with the previous block */
         newBlock=extData->stage2Top;
         min=newBlock-nextOffset; /* minimum block start with overlap */
         while(min<newBlock && extData->stage2[newBlock-1]==0) {
             --newBlock;
         }
 
         extData->stage1[i1]=(uint16_t)newBlock;
         extData->stage2Top=newBlock+MBCS_STAGE_2_BLOCK_SIZE;
-        if(extData->stage2Top>LENGTHOF(extData->stage2)) {
+        if(extData->stage2Top>UPRV_LENGTHOF(extData->stage2)) {
             fprintf(stderr, "error: too many stage 2 entries at U+%04x\n", (int)c);
             exit(U_MEMORY_ALLOCATION_ERROR);
         }
     }
 
     i2=extData->stage1[i1]+nextOffset;
     nextOffset=c&0xf;
 
     if(extData->stage2[i2]==0) {
         /* allocate another block in stage 3; overlap with the previous block */
         newBlock=extData->stage3Top;
         min=newBlock-nextOffset; /* minimum block start with overlap */
         while(min<newBlock && extData->stage3[newBlock-1]==0) {
             --newBlock;
         }
 
         /* round up to a multiple of stage 3 granularity >1 (similar to utrie.c) */
         newBlock=(newBlock+(UCNV_EXT_STAGE_3_GRANULARITY-1))&~(UCNV_EXT_STAGE_3_GRANULARITY-1);
         extData->stage2[i2]=(uint16_t)(newBlock>>UCNV_EXT_STAGE_2_LEFT_SHIFT);
 
         extData->stage3Top=newBlock+MBCS_STAGE_3_BLOCK_SIZE;
-        if(extData->stage3Top>LENGTHOF(extData->stage3)) {
+        if(extData->stage3Top>UPRV_LENGTHOF(extData->stage3)) {
             fprintf(stderr, "error: too many stage 3 entries at U+%04x\n", (int)c);
             exit(U_MEMORY_ALLOCATION_ERROR);
         }
     }
 
     i3=((int32_t)extData->stage2[i2]<<UCNV_EXT_STAGE_2_LEFT_SHIFT)+nextOffset;
     /*
      * assume extData->stage3[i3]==0 because we get
      * code points in strictly ascending order
      */
@@ skipping 23 matching lines @@
                     extData->stage2[i2]=extData->stage3Sub1Block;
                     extData->stage3Top-=MBCS_STAGE_3_BLOCK_SIZE;
                     uprv_memset(extData->stage3+extData->stage3Top, 0, MBCS_STAGE_3_BLOCK_SIZE*2);
                 } else {
                     /* remember this block's stage2 entry */
                     extData->stage3Sub1Block=extData->stage2[i2];
                 }
             }
         }
     } else {
-        if((i3b=extData->stage3bTop++)>=LENGTHOF(extData->stage3b)) {
+        if((i3b=extData->stage3bTop++)>=UPRV_LENGTHOF(extData->stage3b)) {
             fprintf(stderr, "error: too many stage 3b entries at U+%04x\n", (int)c);
             exit(U_MEMORY_ALLOCATION_ERROR);
         }
 
         /* roundtrip or fallback mapping */
         extData->stage3[i3]=(uint16_t)i3b;
         extData->stage3b[i3b]=value;
     }
 }
 
@@ skipping 141 matching lines @@
      * assume that the table is sorted
      *
      * call the functions in this order because
      * makeToUTable() modifies the original reverseMap,
      * makeFromUTable() writes a whole new mapping into reverseMap
      */
     return
         makeToUTable(extData, table) &&
         makeFromUTable(extData, table);
 }