AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-2000 Fixed some compiler warnings

Browse Source 
X-SVN-Rev: 10554
This commit is contained in:
George Rhoten 2002-12-07 00:05:41 +00:00
parent 8b5d063db9
commit 3f7f87ec92
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4c/source/tools/gennorm/store.c
View File

@ -1052,7 +1052,7 @@ postParseFn(void *context, uint32_t code, Norm *norm) {
} else {
uset_add(otherNorm->canonStart, code);
if(!uset_contains(otherNorm->canonStart, code)) {
fprintf(stderr, "gennorm error: uset_add(setOf(U+%4lx), U+%4x)\n", c, code);
fprintf(stderr, "gennorm error: uset_add(setOf(U+%4x), U+%4x)\n", c, code);
exit(U_INTERNAL_PROGRAM_ERROR);
}
}
@ -1384,8 +1384,8 @@ doesComposeConsume(const uint32_t *s, int32_t length, uint32_t c, uint8_t cc) {
for(i=1; i<length; ++i) {
starter=combine((uint32_t)starter, s[i]);
if(starter<0) {
fprintf(stderr, "error: unable to consume normal decomposition in doesComposeConsume(<%04lx, %04lx, ...>[%ld], U+%04lx, %u)\n",
s[0], s[1], length, c, cc);
fprintf(stderr, "error: unable to consume normal decomposition in doesComposeConsume(<%04x, %04x, ...>[%ld], U+%04lx, %u)\n",
s[0], s[1], (long)length, (long)c, cc);
exit(U_INTERNAL_PROGRAM_ERROR);
}
}

46
icu4c/source/tools/makeconv/genmbcs.c
View File

@ -575,7 +575,7 @@ setFallback(MBCSData *mbcsData, uint32_t offset, UChar32 c) {
/* if there is no fallback for this offset, then add one */
i=mbcsData->header.countToUFallbacks;
if(i>=MBCS_MAX_FALLBACK_COUNT) {
fprintf(stderr, "error: too many toUnicode fallbacks, currently at: U+%lx\n", c);
fprintf(stderr, "error: too many toUnicode fallbacks, currently at: U+%x\n", c);
return FALSE;
} else {
mbcsData->toUFallbacks[i].offset=offset;
@ -643,7 +643,7 @@ MBCSAddToUnicode(NewConverter *cnvData,
entry=mbcsData->stateTable[state][bytes[i++]];
if(MBCS_ENTRY_IS_TRANSITION(entry)) {
if(i==length) {
fprintf(stderr, "error: byte sequence too short, ends in non-final state %hu: 0x%02lx (U+%lx)\n",
fprintf(stderr, "error: byte sequence too short, ends in non-final state %hu: 0x%02lx (U+%x)\n",
state, (unsigned long)b, c);
return FALSE;
}
@ -651,21 +651,21 @@ MBCSAddToUnicode(NewConverter *cnvData,
offset+=MBCS_ENTRY_TRANSITION_OFFSET(entry);
} else {
if(i<length) {
fprintf(stderr, "error: byte sequence too long by %d bytes, final state %hu: 0x%02lx (U+%lx)\n",
fprintf(stderr, "error: byte sequence too long by %d bytes, final state %hu: 0x%02lx (U+%x)\n",
(length-i), state, (unsigned long)b, c);
return FALSE;
}
switch(MBCS_ENTRY_FINAL_ACTION(entry)) {
case MBCS_STATE_ILLEGAL:
fprintf(stderr, "error: byte sequence ends in illegal state at U+%04lx<->0x%02lx\n",
fprintf(stderr, "error: byte sequence ends in illegal state at U+%04x<->0x%02lx\n",
c, (unsigned long)b);
return FALSE;
case MBCS_STATE_CHANGE_ONLY:
fprintf(stderr, "error: byte sequence ends in state-change-only at U+%04lx<->0x%02lx\n",
fprintf(stderr, "error: byte sequence ends in state-change-only at U+%04x<->0x%02lx\n",
c, (unsigned long)b);
return FALSE;
case MBCS_STATE_UNASSIGNED:
fprintf(stderr, "error: byte sequence ends in unassigned state at U+%04lx<->0x%02lx\n",
fprintf(stderr, "error: byte sequence ends in unassigned state at U+%04x<->0x%02lx\n",
c, (unsigned long)b);
return FALSE;
case MBCS_STATE_FALLBACK_DIRECT_16:
@ -680,11 +680,11 @@ MBCSAddToUnicode(NewConverter *cnvData,
old=0x10000+MBCS_ENTRY_FINAL_VALUE(entry);
}
if(isFallback>=0) {
fprintf(stderr, "error: duplicate codepage byte sequence at U+%04lx<->0x%02lx see U+%04lx\n",
fprintf(stderr, "error: duplicate codepage byte sequence at U+%04x<->0x%02lx see U+%04lx\n",
c, (unsigned long)b, (long)old);
return FALSE;
} else if(VERBOSE) {
fprintf(stderr, "duplicate codepage byte sequence at U+%04lx<->0x%02lx see U+%04lx\n",
fprintf(stderr, "duplicate codepage byte sequence at U+%04x<->0x%02lx see U+%04lx\n",
c, (unsigned long)b, (long)old);
}
/*
@ -710,16 +710,16 @@ MBCSAddToUnicode(NewConverter *cnvData,
/* check that this byte sequence is still unassigned */
if((old=mbcsData->unicodeCodeUnits[offset])!=0xfffe || (old=removeFallback(mbcsData, offset))!=-1) {
if(isFallback>=0) {
fprintf(stderr, "error: duplicate codepage byte sequence at U+%04lx<->0x%02lx see U+%04lx\n",
fprintf(stderr, "error: duplicate codepage byte sequence at U+%04x<->0x%02lx see U+%04lx\n",
c, (unsigned long)b, (long)old);
return FALSE;
} else if(VERBOSE) {
fprintf(stderr, "duplicate codepage byte sequence at U+%04lx<->0x%02lx see U+%04lx\n",
fprintf(stderr, "duplicate codepage byte sequence at U+%04x<->0x%02lx see U+%04lx\n",
c, (unsigned long)b, (long)old);
}
}
if(c>=0x10000) {
fprintf(stderr, "error: code point does not fit into valid-16-bit state at U+%04lx<->0x%02lx\n",
fprintf(stderr, "error: code point does not fit into valid-16-bit state at U+%04x<->0x%02lx\n",
c, (unsigned long)b);
return FALSE;
}
@ -748,11 +748,11 @@ MBCSAddToUnicode(NewConverter *cnvData,
real=mbcsData->unicodeCodeUnits[offset+1];
}
if(isFallback>=0) {
fprintf(stderr, "error: duplicate codepage byte sequence at U+%04lx<->0x%02lx see U+%04lx\n",
fprintf(stderr, "error: duplicate codepage byte sequence at U+%04x<->0x%02lx see U+%04lx\n",
c, (unsigned long)b, (long)real);
return FALSE;
} else if(VERBOSE) {
fprintf(stderr, "duplicate codepage byte sequence at U+%04lx<->0x%02lx see U+%04lx\n",
fprintf(stderr, "duplicate codepage byte sequence at U+%04x<->0x%02lx see U+%04lx\n",
c, (unsigned long)b, (long)real);
}
}
@ -786,7 +786,7 @@ MBCSAddToUnicode(NewConverter *cnvData,
break;
default:
/* reserved, must never occur */
fprintf(stderr, "internal error: byte sequence reached reserved action code, entry0x%02lx: 0x%02lx (U+%lx)\n",
fprintf(stderr, "internal error: byte sequence reached reserved action code, entry0x%02lx: 0x%02lx (U+%x)\n",
(unsigned long)entry, (unsigned long)b, c);
return FALSE;
}
@ -889,7 +889,7 @@ MBCSSingleAddFromUnicode(NewConverter *cnvData,
if(mbcsData->stage1[index]==MBCS_STAGE_2_ALL_UNASSIGNED_INDEX) {
/* allocate another block in stage 2 */
if(mbcsData->stage2Top>=MBCS_MAX_STAGE_2_TOP) {
fprintf(stderr, "error: too many stage 2 entries at U+%04lx<->0x%02lx\n",
fprintf(stderr, "error: too many stage 2 entries at U+%04x<->0x%02lx\n",
c, (unsigned long)b);
return FALSE;
}
@ -907,7 +907,7 @@ MBCSSingleAddFromUnicode(NewConverter *cnvData,
if(mbcsData->stage2Single[index]==0) {
/* allocate another block in stage 3 */
if(mbcsData->stage3Top>=0x10000) {
fprintf(stderr, "error: too many code points at U+%04lx<->0x%02lx\n",
fprintf(stderr, "error: too many code points at U+%04x<->0x%02lx\n",
c, (unsigned long)b);
return FALSE;
}
@ -931,11 +931,11 @@ MBCSSingleAddFromUnicode(NewConverter *cnvData,
/* check that this Unicode code point was still unassigned */
if(old>=0xf00) {
if(isFallback>=0) {
fprintf(stderr, "error: duplicate Unicode code point at U+%04lx<->0x%02lx see 0x%02x\n",
fprintf(stderr, "error: duplicate Unicode code point at U+%04x<->0x%02lx see 0x%02x\n",
c, (unsigned long)b, old);
return FALSE;
} else if(VERBOSE) {
fprintf(stderr, "duplicate Unicode code point at U+%04lx<->0x%02lx see 0x%02x\n",
fprintf(stderr, "duplicate Unicode code point at U+%04x<->0x%02lx see 0x%02x\n",
c, (unsigned long)b, old);
}
/* continue after the above warning if the precision of the mapping is unspecified */
@ -956,7 +956,7 @@ MBCSAddFromUnicode(NewConverter *cnvData,
if( (mbcsData->header.flags&0xff)==MBCS_OUTPUT_2_SISO &&
(*bytes==0xe || *bytes==0xf)
) {
fprintf(stderr, "error: illegal mapping to SI or SO for SI/SO codepage: U+%04lx<->0x%02lx\n",
fprintf(stderr, "error: illegal mapping to SI or SO for SI/SO codepage: U+%04x<->0x%02lx\n",
c, (unsigned long)b);
return FALSE;
}
@ -973,7 +973,7 @@ MBCSAddFromUnicode(NewConverter *cnvData,
if(mbcsData->stage1[index]==MBCS_STAGE_2_ALL_UNASSIGNED_INDEX) {
/* allocate another block in stage 2 */
if(mbcsData->stage2Top>=MBCS_MAX_STAGE_2_TOP) {
fprintf(stderr, "error: too many stage 2 entries at U+%04lx<->0x%02lx\n",
fprintf(stderr, "error: too many stage 2 entries at U+%04x<->0x%02lx\n",
c, (unsigned long)b);
return FALSE;
}
@ -991,7 +991,7 @@ MBCSAddFromUnicode(NewConverter *cnvData,
if(mbcsData->stage2[index]==0) {
/* allocate another block in stage 3 */
if(mbcsData->stage3Top>=0x100000*mbcsData->maxCharLength) {
fprintf(stderr, "error: too many code points at U+%04lx<->0x%02lx\n",
fprintf(stderr, "error: too many code points at U+%04x<->0x%02lx\n",
c, (unsigned long)b);
return FALSE;
}
@ -1029,11 +1029,11 @@ MBCSAddFromUnicode(NewConverter *cnvData,
/* check that this Unicode code point was still unassigned */
if((mbcsData->stage2[index]&(1UL<<(16+(c&0xf))))!=0 || old!=0) {
if(isFallback>=0) {
fprintf(stderr, "error: duplicate Unicode code point at U+%04lx<->0x%02lx see 0x%02lx\n",
fprintf(stderr, "error: duplicate Unicode code point at U+%04x<->0x%02lx see 0x%02lx\n",
c, (unsigned long)b, (unsigned long)old);
return FALSE;
} else if(VERBOSE) {
fprintf(stderr, "duplicate Unicode code point at U+%04lx<->0x%02lx see 0x%02lx\n",
fprintf(stderr, "duplicate Unicode code point at U+%04x<->0x%02lx see 0x%02lx\n",
c, (unsigned long)b, (unsigned long)old);
}
/* continue after the above warning if the precision of the mapping is