Update ICU to 54.1 step 1

source/samples/uciter8/uciter8.c

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2003-2007, International Business Machines
+*   Copyright (C) 2003-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  uciter8.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2003jan10
 *   created by: Markus W. Scherer
 *
 *   This file contains sample code that illustrates reading
 *   8-bit Unicode text leniently, accepting a mix of UTF-8 and CESU-8
 *   and also accepting single surrogates.
 */
 
 #include <stdio.h>
 #include <string.h>
 #include "unicode/utypes.h"
 #include "unicode/uiter.h"
 #include "uit_len8.h"
 
-#define LENGTHOF(array) (sizeof(array)/sizeof((array)[0]))
-
 #define log_err printf
 
 /* UCharIterator test ------------------------------------------------------- */
 
 /*
  * The following code is a copy of the UCharIterator test code in
  * source/test/cintltst/custrtst.c,
  * testing the lenient-8 iterator instead of the UTF-8 one.
  */
 
@@ skipping 274 matching lines @@
     /* compare the same string between UTF-16 and lenient-8 UCharIterators */
     uiter_setString(&iter1, text, -1);
     uiter_setLenient8(&iter2, (const char *)bytes, sizeof(bytes)-1);
     compareIterators(&iter1, "UTF16Iterator", &iter2, "Lenient8Iterator");
 
     /* try again with length=-1 */
     uiter_setLenient8(&iter2, (const char *)bytes, -1);
     compareIterators(&iter1, "UTF16Iterator", &iter2, "Lenient8Iterator_1");
 
     /* test get/set state */
-    length=LENGTHOF(text)-1;
+    length=UPRV_LENGTHOF(text)-1;
     uiter_setLenient8(&iter1, (const char*)bytes, -1);
     testIteratorState(&iter1, &iter2, "Lenient8IteratorState", length/2);
     testIteratorState(&iter1, &iter2, "Lenient8IteratorStatePlus1", length/2+1);
 
     /* ---------------------------------------------------------------------- */
 
     puts("no output so far means that the lenient-8 iterator works fine");
 
     puts("iterate forward:\nUTF-16\tlenient-8");
     uiter_setString(&iter1, text, -1);
@@ skipping 13 matching lines @@
             printf("%04x\t%04x\n", c1, c2);
         }
     }
 }
 
 extern int
 main(int argc, const char *argv[]) {
     TestLenient8Iterator();
     return 0;
 }