Update ICU to 54.1 step 1

source/common/ustrcase.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2001-2011, International Business Machines
+*   Copyright (C) 2001-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  ustrcase.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2002feb20
 *   created by: Markus W. Scherer
 *
 *   Implementation file for string casing C API functions.
 *   Uses functions from uchar.c for basic functionality that requires access
 *   to the Unicode Character Database (uprops.dat).
 */
 
 #include "unicode/utypes.h"
 #include "unicode/brkiter.h"
 #include "unicode/ustring.h"
 #include "unicode/ucasemap.h"
 #include "unicode/ubrk.h"
 #include "unicode/utf.h"
 #include "unicode/utf16.h"
 #include "cmemory.h"
 #include "ucase.h"
 #include "ustr_imp.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 U_NAMESPACE_USE
 
 /* string casing ------------------------------------------------------------ */
 
 /* Appends a full case mapping result, see UCASE_MAX_STRING_LENGTH. */
 static inline int32_t
 appendResult(UChar *dest, int32_t destIndex, int32_t destCapacity,
              int32_t result, const UChar *s) {
     UChar32 c;
     int32_t length;
@@ skipping 348 matching lines @@
     if(srcLength==-1) {
         srcLength=u_strlen(src);
     }
 
     /* check for overlapping source and destination */
     if( dest!=NULL &&
         ((src>=dest && src<(dest+destCapacity)) ||
          (dest>=src && dest<(src+srcLength)))
     ) {
         /* overlap: provide a temporary destination buffer and later copy the result */
-        if(destCapacity<=LENGTHOF(buffer)) {
+        if(destCapacity<=UPRV_LENGTHOF(buffer)) {
             /* the stack buffer is large enough */
             temp=buffer;
         } else {
             /* allocate a buffer */
             temp=(UChar *)uprv_malloc(destCapacity*U_SIZEOF_UCHAR);
             if(temp==NULL) {
                 *pErrorCode=U_MEMORY_ALLOCATION_ERROR;
                 return 0;
             }
         }
@@ skipping 386 matching lines @@
                         &errorCode);
 }
 
 U_CAPI int32_t U_EXPORT2
 u_strncasecmp(const UChar *s1, const UChar *s2, int32_t n, uint32_t options) {
     UErrorCode errorCode=U_ZERO_ERROR;
     return u_strcmpFold(s1, n, s2, n,
                         options|(U_COMPARE_IGNORE_CASE|_STRNCMP_STYLE),
                         &errorCode);
 }