Update ICU to 54.1 step 1

source/test/cintltst/cstrtest.c

 /*
 **********************************************************************
-* Copyright (C) 1998-2011, International Business Machines Corporation
+* Copyright (C) 1998-2014, International Business Machines Corporation
 * and others.  All Rights Reserved.
 **********************************************************************
 *
 * File cstrtest.c
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   07/13/2000  Madhu         created
 *******************************************************************************
 */
 
 #include "unicode/ustring.h"
 #include "unicode/ucnv.h"
 #include "cstring.h"
 #include "uinvchar.h"
 #include "cintltst.h"
 #include "cmemory.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 static void TestAPI(void);
 void addCStringTest(TestNode** root);
 
 static void TestInvariant(void);
 static void TestCompareInvEbcdicAsAscii(void);
 
 void addCStringTest(TestNode** root) {
     addTest(root, &TestAPI,   "tsutil/cstrtest/TestAPI");
     addTest(root, &TestInvariant,   "tsutil/cstrtest/TestInvariant");
     addTest(root, &TestCompareInvEbcdicAsAscii, "tsutil/cstrtest/TestCompareInvEbcdicAsAscii");
@@ skipping 207 matching lines @@
             log_err("unable to open the default converter\n");
         } else {
             length=ucnv_fromUChars(cnv, cs, sizeof(cs), invariantUChars, -1, &errorCode);
             if(U_FAILURE(errorCode)) {
                 log_err("ucnv_fromUChars(invariantUChars) failed - %s\n", u_errorName(errorCode));
             } else if(length!=sizeof(invariantChars)-1 || strcmp(cs, invariantChars)!=0) {
                 log_err("ucnv_fromUChars(invariantUChars) failed\n");
             }
 
             errorCode=U_ZERO_ERROR;
-            length=ucnv_toUChars(cnv, us, LENGTHOF(us), invariantChars, -1, &errorCode);
+            length=ucnv_toUChars(cnv, us, UPRV_LENGTHOF(us), invariantChars, -1, &errorCode);
             if(U_FAILURE(errorCode)) {
                 log_err("ucnv_toUChars(invariantChars) failed - %s\n", u_errorName(errorCode));
-            } else if(length!=LENGTHOF(invariantUChars)-1 || u_strcmp(us, invariantUChars)!=0) {
+            } else if(length!=UPRV_LENGTHOF(invariantUChars)-1 || u_strcmp(us, invariantUChars)!=0) {
                 log_err("ucnv_toUChars(invariantChars) failed\n");
             }
 
             ucnv_close(cnv);
         }
     }
 
     /* API tests */
     if(!uprv_isInvariantString(invariantChars, -1)) {
         log_err("uprv_isInvariantString(invariantChars) failed\n");
     }
     if(!uprv_isInvariantUString(invariantUChars, -1)) {
         log_err("uprv_isInvariantUString(invariantUChars) failed\n");
     }
     if(!uprv_isInvariantString(invariantChars+strlen(invariantChars), 1)) {
         log_err("uprv_isInvariantString(\"\\0\") failed\n");
     }
 
     for(i=0; i<(sizeof(variantChars)-1); ++i) {
         if(uprv_isInvariantString(variantChars+i, 1)) {
             log_err("uprv_isInvariantString(variantChars[%d]) failed\n", i);
         }
         if(uprv_isInvariantUString(variantUChars+i, 1)) {
             log_err("uprv_isInvariantUString(variantUChars[%d]) failed\n", i);
         }
     }
 
-    for(i=0; i<LENGTHOF(nonASCIIUChars); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(nonASCIIUChars); ++i) {
         if(uprv_isInvariantUString(nonASCIIUChars+i, 1)) {
             log_err("uprv_isInvariantUString(nonASCIIUChars[%d]) failed\n", i);
         }
     }
 }
 
 static int32_t getSign(int32_t n) {
     if(n<0) {
         return -1;
     } else if(n==0) {
@@ skipping 22 matching lines @@
         { "\x6d",         "_" },
         { "\x81",         "a" },
         { "\x81\xf0\xf0", "a00" },
         { "\x81\xf0\xf0", "a00" },
         { "\x81\x81",     "aa" },
         { "\x81\x81\xf0", "aa0" },
         { "\x81\x81\x81", "aaa" },
         { "\x81\x81\x82", "aab" }
     };
     int32_t i;
-    for(i=1; i<LENGTHOF(invStrings); ++i) {
+    for(i=1; i<UPRV_LENGTHOF(invStrings); ++i) {
         int32_t diff1, diff2;
         /* compare previous vs. current */
         diff1=getSign(uprv_compareInvEbcdicAsAscii(invStrings[i-1][0], invStrings[i][0]));
         if(diff1>0 || (diff1==0 && 0!=uprv_strcmp(invStrings[i-1][0], invStrings[i][0]))) {
             log_err("uprv_compareInvEbcdicAsAscii(%s, %s)=%hd is wrong\n",
                     invStrings[i-1][1], invStrings[i][1], (short)diff1);
         }
         /* compare current vs. previous, should be inverse diff */
         diff2=getSign(uprv_compareInvEbcdicAsAscii(invStrings[i][0], invStrings[i-1][0]));
         if(diff2!=-diff1) {
             log_err("uprv_compareInvEbcdicAsAscii(%s, %s)=%hd is wrong\n",
                     invStrings[i][1], invStrings[i-1][1], (short)diff2);
         }
     }
 }