Update ICU to 54.1 step 1

source/common/utrie2_builder.cpp

 /*
 ******************************************************************************
 *
-*   Copyright (C) 2001-2011, International Business Machines
+*   Copyright (C) 2001-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *   file name:  utrie2_builder.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2008sep26 (split off from utrie2.c)
 *   created by: Markus W. Scherer
@@ skipping 11 matching lines @@
 #   include <stdio.h>
 #endif
 
 #include "unicode/utypes.h"
 #include "cmemory.h"
 #include "utrie2.h"
 #include "utrie2_impl.h"
 
 #include "utrie.h" /* for utrie2_fromUTrie() and utrie_swap() */
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 /* Implementation notes ----------------------------------------------------- */
 
 /*
  * The UTRIE2_SHIFT_1, UTRIE2_SHIFT_2, UTRIE2_INDEX_SHIFT and other values
  * have been chosen to minimize trie sizes overall.
  * Most of the code is flexible enough to work with a range of values,
  * within certain limits.
  *
  * Exception: Support for separate values for lead surrogate code _units_
  * vs. code _points_ was added after the constants were fixed,
@@ skipping 421 matching lines @@
     block=trie->index2[i2];
     return (UBool)(block==trie->dataNullOffset);
 }
 
 static int32_t
 allocIndex2Block(UNewTrie2 *trie) {
     int32_t newBlock, newTop;
 
     newBlock=trie->index2Length;
     newTop=newBlock+UTRIE2_INDEX_2_BLOCK_LENGTH;
-    if(newTop>LENGTHOF(trie->index2)) {
+    if(newTop>UPRV_LENGTHOF(trie->index2)) {
         /*
          * Should never occur.
          * Either UTRIE2_MAX_BUILD_TIME_INDEX_LENGTH is incorrect,
          * or the code writes more values than should be possible.
          */
         return -1;
     }
     trie->index2Length=newTop;
     uprv_memcpy(trie->index2+newBlock, trie->index2+trie->index2NullOffset, UTRIE2_INDEX_2_BLOCK_LENGTH*4);
     return newBlock;
@@ skipping 920 matching lines @@
         *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
         return;
     }
 
     /* Delete the UNewTrie2. */
     uprv_free(newTrie->data);
     uprv_free(newTrie);
     trie->newTrie=NULL;
 }
 
-U_CAPI UBool U_EXPORT2
-utrie2_isFrozen(const UTrie2 *trie) {
-    return (UBool)(trie->newTrie==NULL);
-}
-
-U_CAPI int32_t U_EXPORT2
-utrie2_serialize(UTrie2 *trie,
-                 void *data, int32_t capacity,
-                 UErrorCode *pErrorCode) {
-    /* argument check */
-    if(U_FAILURE(*pErrorCode)) {
-        return 0;
-    }
-
-    if( trie==NULL || trie->memory==NULL || trie->newTrie!=NULL ||
-        capacity<0 || (capacity>0 && (data==NULL || (U_POINTER_MASK_LSB(data, 3)!=0)))
-    ) {
-        *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
-        return 0;
-    }
-
-    if(capacity>=trie->length) {
-        uprv_memcpy(data, trie->memory, trie->length);
-    } else {
-        *pErrorCode=U_BUFFER_OVERFLOW_ERROR;
-    }
-    return trie->length;
-}
-
 /*
  * This is here to avoid a dependency from utrie2.cpp on utrie.c.
  * This file already depends on utrie.c.
  * Otherwise, this should be in utrie2.cpp right after utrie2_swap().
  */
 U_CAPI int32_t U_EXPORT2
 utrie2_swapAnyVersion(const UDataSwapper *ds,
                       const void *inData, int32_t length, void *outData,
                       UErrorCode *pErrorCode) {
     if(U_SUCCESS(*pErrorCode)) {
         switch(utrie2_getVersion(inData, length, TRUE)) {
         case 1:
             return utrie_swap(ds, inData, length, outData, pErrorCode);
         case 2:
             return utrie2_swap(ds, inData, length, outData, pErrorCode);
         default:
             *pErrorCode=U_INVALID_FORMAT_ERROR;
             return 0;
         }
     }
     return 0;
 }