Update ICU to 54.1 step 1

source/common/uresdata.c

 /*
 *******************************************************************************
-*                                                                             *
-* Copyright (C) 1999-2012, International Business Machines Corporation        *
-*               and others. All Rights Reserved.                              *
-*                                                                             *
+* Copyright (C) 1999-2014, International Business Machines Corporation
+*               and others. All Rights Reserved.
 *******************************************************************************
 *   file name:  uresdata.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 1999dec08
 *   created by: Markus W. Scherer
 * Modification History:
 *
 *   Date        Name        Description
 *   06/20/2000  helena      OS/400 port changes; mostly typecast.
 *   06/24/02    weiv        Added support for resource sharing
 */
 
 #include "unicode/utypes.h"
 #include "unicode/udata.h"
 #include "unicode/ustring.h"
 #include "unicode/utf16.h"
 #include "cmemory.h"
 #include "cstring.h"
 #include "uarrsort.h"
 #include "udataswp.h"
 #include "ucol_swp.h"
 #include "uinvchar.h"
 #include "uresdata.h"
 #include "uresimp.h"
 #include "uassert.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 /*
  * Resource access helpers
  */
 
 /* get a const char* pointer to the key with the keyOffset byte offset from pRoot */
 #define RES_GET_KEY16(pResData, keyOffset) \
     ((keyOffset)<(pResData)->localKeyLimit ? \
         (const char *)(pResData)->pRoot+(keyOffset) : \
         (pResData)->poolBundleKeys+(keyOffset)-(pResData)->localKeyLimit)
 
@@ skipping 696 matching lines @@
         /* swap length */
         ds->swapArray32(ds, p, 4, q, pErrorCode);
         /* no need to swap or copy bytes - ures_swap() copied them all */
 
         /* swap known formats */
 #if !UCONFIG_NO_COLLATION
         if( key!=NULL &&  /* the binary is in a table */
             (key!=gUnknownKey ?
                 /* its table key string is "%%CollationBin" */
                 0==ds->compareInvChars(ds, key, -1,
-                                       gCollationBinKey, LENGTHOF(gCollationBinKey)-1) :
+                                       gCollationBinKey, UPRV_LENGTHOF(gCollationBinKey)-1) :
                 /* its table key string is unknown but it looks like a collation binary */
                 ucol_looksLikeCollationBinary(ds, p+1, count))
         ) {
-            ucol_swapBinary(ds, p+1, count, q+1, pErrorCode);
+            ucol_swap(ds, p+1, count, q+1, pErrorCode);
         }
 #endif
         break;
     case URES_TABLE:
     case URES_TABLE32:
         {
             const uint16_t *pKey16;
             uint16_t *qKey16;
 
             const int32_t *pKey32;
@@ skipping 369 matching lines @@
         if(tempTable.resFlags!=stackResFlags) {
             uprv_free(tempTable.resFlags);
         }
 
         /* swap the root resource and indexes */
         ds->swapArray32(ds, inBundle, keysBottom*4, outBundle, pErrorCode);
     }
 
     return headerSize+4*top;
 }