ICU-66108.tar.gz

[apple/icu.git] / icuSources / test / cintltst / cucdtst.c

diff --git a/icuSources/test/cintltst/cucdtst.c b/icuSources/test/cintltst/cucdtst.c
index 7a778638732992bc717ce4febd98d0255e03b816..50ed35ed37a8ee2aeeebce6bd253ee0492805836 100644 (file)
--- a/icuSources/test/cintltst/cucdtst.c
+++ b/icuSources/test/cintltst/cucdtst.c
@@ -75,8 +75,9 @@ parseUCDFile(const char *filename,
              char *fields[][2], int32_t fieldCount,
              UParseLineFn *lineFn, void *context,
              UErrorCode *pErrorCode) {
-    char path[256];
-    char backupPath[256];
+    // buffer sizes changed from 256 for APPLE_XCODE_BUILD (which is generating really long pathnames)
+    char path[512];
+    char backupPath[512];
 
     if(U_FAILURE(*pErrorCode)) {
         return;
@@ -963,6 +964,7 @@ unicodeDataLineFn(void *context,
                   char *fields[][2], int32_t fieldCount,
                   UErrorCode *pErrorCode)
 {
+    (void)fieldCount; // suppress compiler warnings about unused variable
     char buffer[100];
     const char *d;
     char *end;
@@ -1022,7 +1024,7 @@ unicodeDataLineFn(void *context,
     /* get BiDi category, field 4 */
     *fields[4][1]=0;
     i=MakeDir(fields[4][0]);
-    if(i!=u_charDirection(c) || i!=u_getIntPropertyValue(c, UCHAR_BIDI_CLASS)) {
+    if(i!=(int32_t)u_charDirection(c) || i!=u_getIntPropertyValue(c, UCHAR_BIDI_CLASS)) {
         log_err("error: u_charDirection(U+%04lx)==%u instead of %u (%s)\n", c, u_charDirection(c), MakeDir(fields[4][0]), fields[4][0]);
     }
 
@@ -1217,6 +1219,8 @@ enumTypeRange(const void *context, UChar32 start, UChar32 limit, UCharCategory t
 
 static UBool U_CALLCONV
 enumDefaultsRange(const void *context, UChar32 start, UChar32 limit, UCharCategory type) {
+    (void)context; // suppress compiler warnings about unused variable
+
     /* default Bidi classes for unassigned code points, from the DerivedBidiClass.txt header */
     static const int32_t defaultBidi[][2]={ /* { limit, class } */
         { 0x0590, U_LEFT_TO_RIGHT },
@@ -1292,7 +1296,7 @@ enumDefaultsRange(const void *context, UChar32 start, UChar32 limit, UCharCatego
                     }
 
                     if( u_charDirection(c)!=shouldBeDir ||
-                        u_getIntPropertyValue(c, UCHAR_BIDI_CLASS)!=shouldBeDir
+                        (UCharDirection)u_getIntPropertyValue(c, UCHAR_BIDI_CLASS)!=shouldBeDir
                     ) {
                         log_err("error: u_charDirection(unassigned/PUA U+%04lx)=%s should be %s\n",
                             c, dirStrings[u_charDirection(c)], dirStrings[shouldBeDir]);
@@ -1651,28 +1655,28 @@ static const struct {
     uint32_t code;
     const char *name, *oldName, *extName, *alias;
 } names[]={
-    {0x0061, "LATIN SMALL LETTER A", "", "LATIN SMALL LETTER A"},
+    {0x0061, "LATIN SMALL LETTER A", "", "LATIN SMALL LETTER A", NULL},
     {0x01a2, "LATIN CAPITAL LETTER OI", "",
              "LATIN CAPITAL LETTER OI",
              "LATIN CAPITAL LETTER GHA"},
     {0x0284, "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK", "",
-             "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK" },
+             "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK", NULL},
     {0x0fd0, "TIBETAN MARK BSKA- SHOG GI MGO RGYAN", "",
              "TIBETAN MARK BSKA- SHOG GI MGO RGYAN",
              "TIBETAN MARK BKA- SHOG GI MGO RGYAN"},
-    {0x3401, "CJK UNIFIED IDEOGRAPH-3401", "", "CJK UNIFIED IDEOGRAPH-3401" },
-    {0x7fed, "CJK UNIFIED IDEOGRAPH-7FED", "", "CJK UNIFIED IDEOGRAPH-7FED" },
-    {0xac00, "HANGUL SYLLABLE GA", "", "HANGUL SYLLABLE GA" },
-    {0xd7a3, "HANGUL SYLLABLE HIH", "", "HANGUL SYLLABLE HIH" },
-    {0xd800, "", "", "<lead surrogate-D800>" },
-    {0xdc00, "", "", "<trail surrogate-DC00>" },
-    {0xff08, "FULLWIDTH LEFT PARENTHESIS", "", "FULLWIDTH LEFT PARENTHESIS" },
-    {0xffe5, "FULLWIDTH YEN SIGN", "", "FULLWIDTH YEN SIGN" },
-    {0xffff, "", "", "<noncharacter-FFFF>" },
+    {0x3401, "CJK UNIFIED IDEOGRAPH-3401", "", "CJK UNIFIED IDEOGRAPH-3401", NULL},
+    {0x7fed, "CJK UNIFIED IDEOGRAPH-7FED", "", "CJK UNIFIED IDEOGRAPH-7FED", NULL},
+    {0xac00, "HANGUL SYLLABLE GA", "", "HANGUL SYLLABLE GA", NULL},
+    {0xd7a3, "HANGUL SYLLABLE HIH", "", "HANGUL SYLLABLE HIH", NULL},
+    {0xd800, "", "", "<lead surrogate-D800>", NULL},
+    {0xdc00, "", "", "<trail surrogate-DC00>", NULL},
+    {0xff08, "FULLWIDTH LEFT PARENTHESIS", "", "FULLWIDTH LEFT PARENTHESIS", NULL},
+    {0xffe5, "FULLWIDTH YEN SIGN", "", "FULLWIDTH YEN SIGN", NULL},
+    {0xffff, "", "", "<noncharacter-FFFF>", NULL},
     {0x1d0c5, "BYZANTINE MUSICAL SYMBOL FHTORA SKLIRON CHROMA VASIS", "",
               "BYZANTINE MUSICAL SYMBOL FHTORA SKLIRON CHROMA VASIS",
               "BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA VASIS"},
-    {0x23456, "CJK UNIFIED IDEOGRAPH-23456", "", "CJK UNIFIED IDEOGRAPH-23456" }
+    {0x23456, "CJK UNIFIED IDEOGRAPH-23456", "", "CJK UNIFIED IDEOGRAPH-23456", NULL}
 };
 
 static UBool
@@ -1908,7 +1912,8 @@ TestCharNames() {
                 uset_add,
                 uset_addRange,
                 uset_addString,
-                NULL /* don't need remove() */
+                NULL, /* don't need remove() */
+                NULL  /* don't need removeRange() */
             };
             sa.set=set;
             uprv_getCharNameCharacters(&sa);
@@ -3418,6 +3423,8 @@ static void U_CALLCONV
 caseFoldingLineFn(void *context,
                   char *fields[][2], int32_t fieldCount,
                   UErrorCode *pErrorCode) {
+    (void)fieldCount; // suppress compiler warnings about unused variable
+
     CaseFoldingData *pData=(CaseFoldingData *)context;
     char *end;
     UChar full[32];
@@ -3525,7 +3532,7 @@ caseFoldingLineFn(void *context,
 
 static void
 TestCaseFolding() {
-    CaseFoldingData data={ NULL };
+    CaseFoldingData data={ NULL, 0, 0, {0}, 0, 0 };
     char *fields[3][2];
     UErrorCode errorCode;