diff --git a/icu4c/source/tools/dumpce/dumpce.cpp b/icu4c/source/tools/dumpce/dumpce.cpp index 84c44827d4f..cb2d4748ef7 100644 --- a/icu4c/source/tools/dumpce/dumpce.cpp +++ b/icu4c/source/tools/dumpce/dumpce.cpp @@ -87,6 +87,7 @@ static const EnumNameValuePair ATTRIBUTE_NAME_[] = { {UCOL_NORMALIZATION_MODE, "UCOL_NORMALIZATION_MODE|UCOL_DECOMPOSITION_MODE"}, {UCOL_STRENGTH, "UCOL_STRENGTH"}, + {UCOL_HIRAGANA_QUATERNARY_MODE, "UCOL_HIRAGANA_QUATERNARY_MODE"}, NULL }; @@ -271,12 +272,8 @@ void serialize(FILE *f, UChar *rule, int rlen, UBool contractiononly, src.extraEnd = src.end + UCOL_TOK_EXTRA_RULE_SPACE_SIZE; - while ((current = ucol_tok_parseNextToken(&src, &strength, &chOffset, - &chLen, &exOffset, &exLen, - &prefixOffset, &prefixLen, - &specs, rstart, &parseError, - &error)) - != NULL) { + while ((current = ucol_tok_parseNextToken(&src, rstart, &parseError, + &error)) != NULL) { // contractions handled here if (!contractiononly || chLen > 1) { ucol_setText(iter, rule + chOffset, chLen, &error); @@ -1041,12 +1038,15 @@ int getScriptElements(UScriptCode script[], int scriptcount, src.extraEnd = src.end + UCOL_TOK_EXTRA_RULE_SPACE_SIZE; src.opts = &opts; - while ((current = ucol_tok_parseNextToken(&src, &strength, &chOffset, + /* + ucol_tok_parseNextToken(&src, &strength, &chOffset, &chLen, &exOffset, &exLen, &prefixOffset, &prefixLen, &specs, rstart, &parseError, - &error)) - != NULL) { + &error) + */ + while ((current = ucol_tok_parseNextToken(&src, rstart, &parseError, + &error)) != NULL) { // contractions handled here if (chLen > 1) { u_strncpy(scriptelem[count].ch, rule + chOffset, chLen); @@ -1144,12 +1144,8 @@ void markTailored(UScriptCode script[], int scriptcount, UErrorCode error = U_ZERO_ERROR; - while ((current = ucol_tok_parseNextToken(&src, &strength, &chOffset, - &chLen, &exOffset, &exLen, - &prefixOffset, &prefixLen, - &specs, rstart, &parseError, - &error)) - != NULL) { + while ((current = ucol_tok_parseNextToken(&src, rstart, &parseError, + &error)) != NULL) { if (chLen >= 1 && strength != UCOL_TOK_RESET) { // skipping the reset characters and non useful stuff. ScriptElement se; @@ -1285,7 +1281,7 @@ void outputHTMLHeader(const char *locale, UScriptCode script[], fprintf(OUTPUT_, "\n"); fprintf(OUTPUT_, "\n"); - fprintf(OUTPUT_, "\n"); + fprintf(OUTPUT_, "\n"); fprintf(OUTPUT_, "