ICU-535 fixed some compiler warnings
X-SVN-Rev: 2201
This commit is contained in:
parent
3508752164
commit
040a460a82
@ -39,10 +39,10 @@ static int dotestname(const char *name, const char *standard, const char *expect
|
|||||||
tag = ucnv_getStandardName(name, standard, &error);
|
tag = ucnv_getStandardName(name, standard, &error);
|
||||||
if (!tag) {
|
if (!tag) {
|
||||||
log_err("FAIL: could not find %s standard name for %s\n", standard, name);
|
log_err("FAIL: could not find %s standard name for %s\n", standard, name);
|
||||||
res = 0;
|
res = 0;
|
||||||
} else if (expected && uprv_strcmp(expected, tag)) {
|
} else if (expected && uprv_strcmp(expected, tag)) {
|
||||||
log_err("FAIL: expected %s for %s standard name for %s, got %s\n", expected, standard, name, tag);
|
log_err("FAIL: expected %s for %s standard name for %s, got %s\n", expected, standard, name, tag);
|
||||||
res = 0;
|
res = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
@ -52,11 +52,11 @@ void TestStandardNames()
|
|||||||
{
|
{
|
||||||
int res = 1;
|
int res = 1;
|
||||||
|
|
||||||
int i, count;
|
uint16_t i, count;
|
||||||
UErrorCode err;
|
UErrorCode err;
|
||||||
|
|
||||||
/* Iterate over all standards. */
|
/* Iterate over all standards. */
|
||||||
|
|
||||||
for (i = 0, count = ucnv_countStandards(); i < count; ++i) {
|
for (i = 0, count = ucnv_countStandards(); i < count; ++i) {
|
||||||
const char *std;
|
const char *std;
|
||||||
|
|
||||||
|
@ -216,7 +216,7 @@ main(int argc, const char *argv[]) {
|
|||||||
|
|
||||||
/* determine the length of tables for the data offset of the strings */
|
/* determine the length of tables for the data offset of the strings */
|
||||||
tagOffset = 2 + 4 * aliasCount + 2 + 4 * converterCount;
|
tagOffset = 2 + 4 * aliasCount + 2 + 4 * converterCount;
|
||||||
stringOffset = tagOffset + 2 + (2 * tagCount) * converterCount + tagBlock.top;
|
stringOffset = (uint16_t)(tagOffset + 2 + (2 * tagCount) * converterCount + tagBlock.top);
|
||||||
|
|
||||||
/* write the table of aliases */
|
/* write the table of aliases */
|
||||||
udata_write16(out, aliasCount);
|
udata_write16(out, aliasCount);
|
||||||
@ -314,15 +314,15 @@ parseLine(const char *line) {
|
|||||||
++pos;
|
++pos;
|
||||||
}
|
}
|
||||||
limit = pos;
|
limit = pos;
|
||||||
|
|
||||||
if (start != limit) {
|
if (start != limit) {
|
||||||
uint16_t tag;
|
uint16_t tag;
|
||||||
|
|
||||||
/* add the tag to the tag table */
|
/* add the tag to the tag table */
|
||||||
tag = getTagNumber(line + start, limit - start);
|
tag = getTagNumber(line + start, (uint16_t)(limit - start));
|
||||||
addTaggedAlias(tag, alias, cnv);
|
addTaggedAlias(tag, alias, cnv);
|
||||||
}
|
}
|
||||||
|
|
||||||
while (line[pos] && isspace((unsigned char)line[pos])) {
|
while (line[pos] && isspace((unsigned char)line[pos])) {
|
||||||
++pos;
|
++pos;
|
||||||
}
|
}
|
||||||
@ -383,7 +383,7 @@ parseLine(const char *line) {
|
|||||||
uint16_t tag;
|
uint16_t tag;
|
||||||
|
|
||||||
/* add the tag to the tag table */
|
/* add the tag to the tag table */
|
||||||
tag = getTagNumber(line + start, limit - start);
|
tag = getTagNumber(line + start, (uint16_t)(limit - start));
|
||||||
addTaggedAlias(tag, alias, cnv);
|
addTaggedAlias(tag, alias, cnv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user