Commit 0db7ebe
tools: fix iculslocs to support ICU 65.1
The ICU alias table format changed in
https://unicode-org.atlassian.net/browse/ICU-20627
Because of this, iculslocs.cc needs to handle URES_TABLE format
contents in the res_index.txt file.
PR-URL: #29523
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>1 parent 9abee07 commit 0db7ebe
1 file changed
Lines changed: 11 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -209,7 +209,8 @@ int dumpAllButInstalledLocales(int lev, | |||
| 209 | 209 | } else { | |
| 210 | 210 | printIndent(bf, lev); | |
| 211 | 211 | fprintf(bf, "%s", key); | |
| 212 | - switch (ures_getType(t.getAlias())) { | ||
| 212 | + const UResType type = ures_getType(t.getAlias()); | ||
| 213 | + switch (type) { | ||
| 213 | 214 | case URES_STRING: { | |
| 214 | 215 | int32_t len = 0; | |
| 215 | 216 | const UChar* s = ures_getString(t.getAlias(), &len, status); | |
@@ -218,8 +219,16 @@ int dumpAllButInstalledLocales(int lev, | |||
| 218 | 219 | fwrite(s, len, 1, bf); | |
| 219 | 220 | fprintf(bf, "\"}"); | |
| 220 | 221 | } break; | |
| 222 | + case URES_TABLE: { | ||
| 223 | + fprintf(bf, ":table {\n"); | ||
| 224 | + dumpAllButInstalledLocales(lev+1, &t, bf, status); | ||
| 225 | + printIndent(bf, lev); | ||
| 226 | + fprintf(bf, "}\n"); | ||
| 227 | + } break; | ||
| 221 | 228 | default: { | |
| 222 | - printf("ERROR: unhandled type in dumpAllButInstalledLocales().\n"); | ||
| 229 | + printf("ERROR: unhandled type %d for key %s " | ||
| 230 | + "in dumpAllButInstalledLocales().\n", | ||
| 231 | + static_cast<int>(type), key); | ||
| 223 | 232 | return 1; | |
| 224 | 233 | } break; | |
| 225 | 234 | } | |
0 commit comments