ICU-900 Fixed some compiler warnings.
X-SVN-Rev: 6131
This commit is contained in:
parent
70f2586f27
commit
29f85a4fb6
@ -990,12 +990,13 @@ make32BitNorm(Norm *norm) {
|
|||||||
if((norm->qcFlags&_NORM_QC_NFC)==0 && norm->lenNFD>0) {
|
if((norm->qcFlags&_NORM_QC_NFC)==0 && norm->lenNFD>0) {
|
||||||
/* a "true" NFC starter with a canonical decomposition */
|
/* a "true" NFC starter with a canonical decomposition */
|
||||||
if( norm->canonBothCCs>=0x100 || /* lead cc!=0 or */
|
if( norm->canonBothCCs>=0x100 || /* lead cc!=0 or */
|
||||||
(other=getNorm(norm->nfd[0]))!=NULL && (other->qcFlags&_NORM_QC_NFC)!=0 /* nfd[0] not NFC_YES */
|
((other=getNorm(norm->nfd[0]))!=NULL && (other->qcFlags&_NORM_QC_NFC)!=0) /* nfd[0] not NFC_YES */
|
||||||
) {
|
) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"error: true NFC starter canonical decomposition[%u] does not begin\n"
|
"error: true NFC starter canonical decomposition[%u] does not begin\n"
|
||||||
" with a true NFC starter: U+%04lx U+%04lx%s\n",
|
" with a true NFC starter: U+%04lx U+%04lx%s\n",
|
||||||
norm->lenNFD, norm->nfd[0], norm->nfd[1], norm->lenNFD<=2 ? "" : " ...");
|
norm->lenNFD, (long)norm->nfd[0], (long)norm->nfd[1],
|
||||||
|
norm->lenNFD<=2 ? "" : " ...");
|
||||||
exit(U_INVALID_TABLE_FILE);
|
exit(U_INVALID_TABLE_FILE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1004,23 +1005,24 @@ make32BitNorm(Norm *norm) {
|
|||||||
if(norm->lenNFKD>0) {
|
if(norm->lenNFKD>0) {
|
||||||
/* a "true" NFKC starter with a compatibility decomposition */
|
/* a "true" NFKC starter with a compatibility decomposition */
|
||||||
if( norm->compatBothCCs>=0x100 || /* lead cc!=0 or */
|
if( norm->compatBothCCs>=0x100 || /* lead cc!=0 or */
|
||||||
(other=getNorm(norm->nfkd[0]))!=NULL && (other->qcFlags&_NORM_QC_NFKC)!=0 /* nfkd[0] not NFC_YES */
|
((other=getNorm(norm->nfkd[0]))!=NULL && (other->qcFlags&_NORM_QC_NFKC)!=0) /* nfkd[0] not NFC_YES */
|
||||||
) {
|
) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"error: true NFKC starter compatibility decomposition[%u] does not begin\n"
|
"error: true NFKC starter compatibility decomposition[%u] does not begin\n"
|
||||||
" with a true NFKC starter: U+%04lx U+%04lx%s\n",
|
" with a true NFKC starter: U+%04lx U+%04lx%s\n",
|
||||||
norm->lenNFKD, norm->nfkd[0], norm->nfkd[1], norm->lenNFKD<=2 ? "" : " ...");
|
norm->lenNFKD, (long)norm->nfkd[0], (long)norm->nfkd[1], norm->lenNFKD<=2 ? "" : " ...");
|
||||||
exit(U_INVALID_TABLE_FILE);
|
exit(U_INVALID_TABLE_FILE);
|
||||||
}
|
}
|
||||||
} else if(norm->lenNFD>0) {
|
} else if(norm->lenNFD>0) {
|
||||||
/* a "true" NFKC starter with only a canonical decomposition */
|
/* a "true" NFKC starter with only a canonical decomposition */
|
||||||
if( norm->canonBothCCs>=0x100 || /* lead cc!=0 or */
|
if( norm->canonBothCCs>=0x100 || /* lead cc!=0 or */
|
||||||
(other=getNorm(norm->nfd[0]))!=NULL && (other->qcFlags&_NORM_QC_NFKC)!=0 /* nfd[0] not NFC_YES */
|
((other=getNorm(norm->nfd[0]))!=NULL && (other->qcFlags&_NORM_QC_NFKC)!=0) /* nfd[0] not NFC_YES */
|
||||||
) {
|
) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"error: true NFKC starter canonical decomposition[%u] does not begin\n"
|
"error: true NFKC starter canonical decomposition[%u] does not begin\n"
|
||||||
" with a true NFKC starter: U+%04lx U+%04lx%s\n",
|
" with a true NFKC starter: U+%04lx U+%04lx%s\n",
|
||||||
norm->lenNFD, norm->nfd[0], norm->nfd[1], norm->lenNFD<=2 ? "" : " ...");
|
norm->lenNFD, (long)norm->nfd[0], (long)norm->nfd[1],
|
||||||
|
norm->lenNFD<=2 ? "" : " ...");
|
||||||
exit(U_INVALID_TABLE_FILE);
|
exit(U_INVALID_TABLE_FILE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user