Update ICU to 54.1 step 1

source/test/cintltst/bocu1tst.c

 /*
 ******************************************************************************
 *
-*   Copyright (C) 2002-2011, International Business Machines
+*   Copyright (C) 2002-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *   file name:  bocu1tst.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2002may27
 *   created by: Markus W. Scherer
@@ skipping 13 matching lines @@
 *   ### links in design doc to here and to ucnvbocu.c
 */
 
 #include "unicode/utypes.h"
 #include "unicode/ustring.h"
 #include "unicode/ucnv.h"
 #include "unicode/utf16.h"
 #include "cmemory.h"
 #include "cintltst.h"
 
-#define LENGTHOF(array) (sizeof(array)/sizeof((array)[0]))
-
 /* icuhtml/design/conversion/bocu1/bocu1.h ---------------------------------- */
 
 /* BOCU-1 constants and macros ---------------------------------------------- */
 
 /*
  * BOCU-1 encodes the code points of a Unicode string as
  * a sequence of byte-encoded differences (slope detection),
  * preserving lexical order.
  *
  * Optimize the difference-taking for runs of Unicode text within
@@ skipping 894 matching lines @@
 static const UChar plane1[]={ 0xd800, 0xdc00 };
 static const UChar plane2[]={ 0xd845, 0xdddd };
 static const UChar plane15[]={ 0xdbbb, 0xddee, 0x20 };
 static const UChar plane16[]={ 0xdbff, 0xdfff };
 static const UChar c0[]={ 1, 0xe40, 0x20, 9 };
 
 static const struct {
     const UChar *s;
     int32_t length;
 } strings[]={
-    { feff,         LENGTHOF(feff) },
-    { ascii,        LENGTHOF(ascii) },
-    { crlf,         LENGTHOF(crlf) },
-    { nul,          LENGTHOF(nul) },
-    { latin,        LENGTHOF(latin) },
-    { devanagari,   LENGTHOF(devanagari) },
-    { hiragana,     LENGTHOF(hiragana) },
-    { unihan,       LENGTHOF(unihan) },
-    { hangul,       LENGTHOF(hangul) },
-    { surrogates,   LENGTHOF(surrogates) },
-    { plane1,       LENGTHOF(plane1) },
-    { plane2,       LENGTHOF(plane2) },
-    { plane15,      LENGTHOF(plane15) },
-    { plane16,      LENGTHOF(plane16) },
-    { c0,           LENGTHOF(c0) }
+    { feff,         UPRV_LENGTHOF(feff) },
+    { ascii,        UPRV_LENGTHOF(ascii) },
+    { crlf,         UPRV_LENGTHOF(crlf) },
+    { nul,          UPRV_LENGTHOF(nul) },
+    { latin,        UPRV_LENGTHOF(latin) },
+    { devanagari,   UPRV_LENGTHOF(devanagari) },
+    { hiragana,     UPRV_LENGTHOF(hiragana) },
+    { unihan,       UPRV_LENGTHOF(unihan) },
+    { hangul,       UPRV_LENGTHOF(hangul) },
+    { surrogates,   UPRV_LENGTHOF(surrogates) },
+    { plane1,       UPRV_LENGTHOF(plane1) },
+    { plane2,       UPRV_LENGTHOF(plane2) },
+    { plane15,      UPRV_LENGTHOF(plane15) },
+    { plane16,      UPRV_LENGTHOF(plane16) },
+    { c0,           UPRV_LENGTHOF(c0) }
 };
 
 /*
  * Verify that the ICU BOCU-1 implementation produces the same results as
  * the reference implementation from the design folder.
  * Generate some texts and convert them with both converters, verifying
  * identical results and roundtripping.
  */
 static void
 TestBOCU1(void) {
     UChar *text;
     int32_t i, length;
 
     UConverter *bocu1;
     UErrorCode errorCode;
 
     errorCode=U_ZERO_ERROR;
     bocu1=ucnv_open("BOCU-1", &errorCode);
     if(U_FAILURE(errorCode)) {
         log_err("error: unable to open BOCU-1 converter: %s\n", u_errorName(errorCode));
         return;
     }
 
     text = malloc(DEFAULT_BUFFER_SIZE * sizeof(UChar));
 
     /* text 1: each of strings[] once */
     length=0;
-    for(i=0; i<LENGTHOF(strings); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(strings); ++i) {
         u_memcpy(text+length, strings[i].s, strings[i].length);
         length+=strings[i].length;
     }
     roundtripBOCU1(bocu1, 1, text, length);
 
     /* text 2: each of strings[] twice */
     length=0;
-    for(i=0; i<LENGTHOF(strings); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(strings); ++i) {
         u_memcpy(text+length, strings[i].s, strings[i].length);
         length+=strings[i].length;
         u_memcpy(text+length, strings[i].s, strings[i].length);
         length+=strings[i].length;
     }
     roundtripBOCU1(bocu1, 2, text, length);
 
     /* text 3: each of strings[] many times (set step vs. |strings| so that all strings are used) */
     length=0;
     for(i=1; length<5000; i+=7) {
-        if(i>=LENGTHOF(strings)) {
-            i-=LENGTHOF(strings);
+        if(i>=UPRV_LENGTHOF(strings)) {
+            i-=UPRV_LENGTHOF(strings);
         }
         u_memcpy(text+length, strings[i].s, strings[i].length);
         length+=strings[i].length;
     }
     roundtripBOCU1(bocu1, 3, text, length);
 
     ucnv_close(bocu1);
     free(text);
 }
 
 U_CFUNC void addBOCU1Tests(TestNode** root);
 
 U_CFUNC void
 addBOCU1Tests(TestNode** root) {
     addTest(root, TestBOCU1RefDiff, "tsconv/bocu1tst/TestBOCU1RefDiff");
     addTest(root, TestBOCU1, "tsconv/bocu1tst/TestBOCU1");
 }