Update ICU to 54.1 step 1

source/test/cintltst/nucnvtst.c

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2012, International Business Machines Corporation and
+ * Copyright (c) 1997-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /*******************************************************************************
 *
 * File CCONVTST.C
 *
 * Modification History:
 *        Name                     Description
 *    Steven R. Loomis     7/8/1999      Adding input buffer test
 ********************************************************************************
 */
 #include <stdio.h>
 #include "cstring.h"
 #include "unicode/uloc.h"
 #include "unicode/ucnv.h"
 #include "unicode/ucnv_err.h"
 #include "unicode/ucnv_cb.h"
 #include "cintltst.h"
 #include "unicode/utypes.h"
 #include "unicode/ustring.h"
 #include "unicode/ucol.h"
 #include "unicode/utf16.h"
 #include "cmemory.h"
 #include "nucnvtst.h"
 
-#define LENGTHOF(array) (sizeof(array)/sizeof((array)[0]))
-
 static void TestNextUChar(UConverter* cnv, const char* source, const char* limit, const int32_t results[], const char* message);
 static void TestNextUCharError(UConverter* cnv, const char* source, const char* limit, UErrorCode expected, const char* message);
 #if !UCONFIG_NO_COLLATION
 static void TestJitterbug981(void);
 #endif
 #if !UCONFIG_NO_LEGACY_CONVERSION
 static void TestJitterbug1293(void);
 #endif
 static void TestNewConvertWithBufferSizes(int32_t osize, int32_t isize) ;
 static void TestConverterTypesAndStarters(void);
@@ skipping 5349 matching lines @@
         return;
     }
     myCollator = ucol_open("zh", &status);
     if(U_FAILURE(status)){
         log_data_err("Could not open collator for zh locale. Error: %s\n", u_errorName(status));
         ucnv_close(utf8cnv);
         return;
     }
 
     rules = ucol_getRules(myCollator, &rules_length);
+    if(rules_length == 0) {
+        log_data_err("missing zh tailoring rule string\n");
+        ucol_close(myCollator);
+        ucnv_close(utf8cnv);
+        return;
+    }
     buff_size = rules_length * ucnv_getMaxCharSize(utf8cnv);
     buff = malloc(buff_size);
 
     target_cap = 0;
     do {
         ucnv_reset(utf8cnv);
         status = U_ZERO_ERROR;
         if(target_cap >= buff_size) {
             log_err("wanted %d bytes, only %d available\n", target_cap, buff_size);
             break;
@@ skipping 152 matching lines @@
             "ibm-5478_P100-1995"
     };
 
     const char *notFixedWidth[] = {
             "GB18030",
             "UTF8",
             "windows-949-2000",
             "UTF16"
     };
 
-    for (i = 0; i < LENGTHOF(fixedWidth); i++) {
+    for (i = 0; i < UPRV_LENGTHOF(fixedWidth); i++) {
         cnv = ucnv_open(fixedWidth[i], &status);
         if (cnv == NULL || U_FAILURE(status)) {
             log_data_err("Error open converter: %s - %s \n", fixedWidth[i], u_errorName(status));
             continue;
         }
 
         if (!ucnv_isFixedWidth(cnv, &status)) {
             log_err("%s is a fixedWidth converter but returned FALSE.\n", fixedWidth[i]);
         }
         ucnv_close(cnv);
     }
 
-    for (i = 0; i < LENGTHOF(notFixedWidth); i++) {
+    for (i = 0; i < UPRV_LENGTHOF(notFixedWidth); i++) {
         cnv = ucnv_open(notFixedWidth[i], &status);
         if (cnv == NULL || U_FAILURE(status)) {
             log_data_err("Error open converter: %s - %s \n", notFixedWidth[i], u_errorName(status));
             continue;
         }
 
         if (ucnv_isFixedWidth(cnv, &status)) {
             log_err("%s is NOT a fixedWidth converter but returned TRUE.\n", notFixedWidth[i]);
         }
         ucnv_close(cnv);
     }
 }