Update ICU to 54.1 step 1

source/test/cintltst/spreptst.c

 /*
  *******************************************************************************
  *
- *   Copyright (C) 2003-2010, International Business Machines
+ *   Copyright (C) 2003-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   file name:  spreptst.c
  *   encoding:   US-ASCII
  *   tab size:   8 (not used)
  *   indentation:4
  *
  *   created on: 2003jul11
  *   created by: Ram Viswanadha
  */
 #include <stdlib.h>
 #include <string.h>
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_IDNA
 
 #include "unicode/ustring.h"
 #include "unicode/usprep.h"
 #include "cstring.h"
 #include "cintltst.h"
 #include "nfsprep.h"
 
-
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 void addUStringPrepTest(TestNode** root);
 void doStringPrepTest(const char* binFileName, const char* txtFileName, 
                  int32_t options, UErrorCode* errorCode);
 
 static void Test_nfs4_cs_prep_data(void);
 static void Test_nfs4_cis_prep_data(void);
 static void Test_nfs4_mixed_prep_data(void);
 static void Test_nfs4_cs_prep(void);
 static void Test_nfs4_cis_prep(void);
 static void Test_nfs4_mixed_prep(void);
@@ skipping 396 matching lines @@
     if (U_FAILURE(loadStatus)) {
         log_data_err("Test could not initialize. Got %s\n", u_errorName(loadStatus));
         return;
     }
 
     {
         int32_t i=0;
         char src[MAX_BUFFER_SIZE];
         int32_t srcLen;
 
-        for(i=0; i< LENGTHOF(mixed_prep_data); i++){
+        for(i=0; i< UPRV_LENGTHOF(mixed_prep_data); i++){
             int32_t destLen=0;
             char* dest = NULL;
             UErrorCode status = U_ZERO_ERROR;
             UParseError parseError;
             srcLen = unescapeData(mixed_prep_data[i], (int32_t)strlen(mixed_prep_data[i]), src, MAX_BUFFER_SIZE, &status);
             if(U_FAILURE(status)){
                 log_err("Conversion of data at index %i failed. Error: %s\n", i, u_errorName(status));
                 continue;
             }
             destLen = nfs4_mixed_prepare(src, srcLen, NULL, 0, &parseError, &status);
@@ skipping 296 matching lines @@
 static void TestStringPrepProfiles(void) {
     UErrorCode status = U_ZERO_ERROR;
     const char *profileName = NULL;
     UChar src[SPREP_PROFILE_TEST_MAX_LENGTH];
     UChar expected[SPREP_PROFILE_TEST_MAX_LENGTH];
     UChar result[SPREP_PROFILE_TEST_MAX_LENGTH];
     int32_t srcLength, resultLength, expectedLength;
     int32_t i, testNum = 0;
     UStringPrepProfile *sprep = NULL;
     
-    for (i = 0; i < LENGTHOF(profile_test_case); i++) {
+    for (i = 0; i < UPRV_LENGTHOF(profile_test_case); i++) {
         if (uprv_strstr(profile_test_case[i], "RFC")) {
             if (sprep != NULL) {
                 usprep_close(sprep);
                 sprep = NULL;
             }
             profileName = profile_test_case[i];
             sprep = usprep_openByType(getTypeFromProfileName(profileName), &status);
             if (U_FAILURE(status)) {
                 log_data_err("Unable to open String Prep Profile with: %s\n", profileName);
                 break;
@@ skipping 36 matching lines @@
 #endif
 
 /*
  * Hey, Emacs, please set the following:
  *
  * Local Variables:
  * indent-tabs-mode: nil
  * End:
  *
  */