organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 15:05:53 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-6530 fix some gcc warnings

Browse source 
X-SVN-Rev: 24865
This commit is contained in:
Markus Scherer 2008-10-22 22:28:06 +00:00
parent 9be9a82b08
commit 362d08e00b
7 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
icu4c/source/common/ubidi_props_data.c
View file

@ -623,6 +623,7 @@ static const UBiDiProps ubidi_props_singleton={
0x0,
0x110000,
0x2318,
NULL, 0, FALSE, FALSE, 0, NULL
},
{ 2,0,0,0 }
};

1
icu4c/source/common/ucase_props_data.c
View file

@ -678,6 +678,7 @@ static const UCaseProps ucase_props_singleton={
0x0,
0xe0800,
0x218c,
NULL, 0, FALSE, FALSE, 0, NULL
},
{ 2,1,0,0 }
};

2
icu4c/source/common/uchar_props_data.c
View file

@ -983,6 +983,7 @@ static const UTrie2 propsTrie={
0x0,
0x110000,
0x3bc4,
NULL, 0, FALSE, FALSE, 0, NULL
};
static const uint16_t propsVectorsTrie_index[18096]={
@ -2131,6 +2132,7 @@ static const UTrie2 propsVectorsTrie={
0x0,
0x110000,
0x46ac,
NULL, 0, FALSE, FALSE, 0, NULL
};
static const uint32_t propsVectors[3891]={

21
icu4c/source/common/unorm.cpp
View file

@ -833,7 +833,7 @@ _getNextCC(const UChar *&p, const UChar *limit, UChar &c, UChar &c2) {
*/
static inline uint32_t
_getPrevNorm32(const UChar *start, const UChar *&src,
uint32_t minC, uint32_t mask,
uint32_t minC,
UChar &c, UChar &c2) {
c=*--src;
c2=0;
@ -861,7 +861,7 @@ static inline uint8_t
_getPrevCC(const UChar *start, const UChar *&p) {
UChar c, c2;
return (uint8_t)(_getPrevNorm32(start, p, _NORM_MIN_WITH_LEAD_CC, _NORM_CC_MASK, c, c2)>>_NORM_CC_SHIFT);
return (uint8_t)(_getPrevNorm32(start, p, _NORM_MIN_WITH_LEAD_CC, c, c2)>>_NORM_CC_SHIFT);
}
/*
@ -1399,7 +1399,7 @@ _findPreviousStarter(const UChar *start, const UChar *src,
UChar c, c2;
while(start<src) {
norm32=_getPrevNorm32(start, src, minNoMaybe, ccOrQCMask|decompQCMask, c, c2);
norm32=_getPrevNorm32(start, src, minNoMaybe, c, c2);
if(_isTrueStarter(norm32, ccOrQCMask, decompQCMask)) {
break;
}
@ -3410,7 +3410,7 @@ unorm_normalize(const UChar *src, int32_t srcLength,
* if c2!=0 then (c2, c) is a surrogate pair (reversed - c2 is first surrogate but read second!)
*/
static inline uint32_t
_getPrevNorm32(UCharIterator &src, uint32_t minC, uint32_t mask, UChar &c, UChar &c2) {
_getPrevNorm32(UCharIterator &src, uint32_t minC, UChar &c, UChar &c2) {
uint32_t norm32;
/* need src.hasPrevious() */
@ -3426,14 +3426,7 @@ _getPrevNorm32(UCharIterator &src, uint32_t minC, uint32_t mask, UChar &c, UChar
/* unpaired surrogate */
return 0;
} else if(UTF_IS_FIRST_SURROGATE(c2=(UChar)src.previous(&src))) {
norm32=_getNorm32(c2);
if((norm32&mask)==0) {
/* all surrogate pairs with this lead surrogate have irrelevant data */
return 0;
} else {
/* norm32 must be a surrogate special */
return _getNorm32FromSurrogatePair(c2, c);
}
return _getNorm32FromSurrogatePair(c2, c);
} else {
/* unpaired second surrogate, undo the c2=src.previous() movement */
src.move(&src, 1, UITER_CURRENT);
@ -3456,7 +3449,7 @@ IsPrevBoundaryFn(UCharIterator &src, uint32_t minC, uint32_t mask, UChar &c, UCh
*/
static UBool
_isPrevNFDSafe(UCharIterator &src, uint32_t minC, uint32_t ccOrQCMask, UChar &c, UChar &c2) {
return _isNFDSafe(_getPrevNorm32(src, minC, ccOrQCMask, c, c2), ccOrQCMask, ccOrQCMask&_NORM_QC_MASK);
return _isNFDSafe(_getPrevNorm32(src, minC, c, c2), ccOrQCMask, ccOrQCMask&_NORM_QC_MASK);
}
/*
@ -3469,7 +3462,7 @@ _isPrevTrueStarter(UCharIterator &src, uint32_t minC, uint32_t ccOrQCMask, UChar
uint32_t norm32, decompQCMask;
decompQCMask=(ccOrQCMask<<2)&0xf; /* decomposition quick check mask */
norm32=_getPrevNorm32(src, minC, ccOrQCMask|decompQCMask, c, c2);
norm32=_getPrevNorm32(src, minC, c, c2);
return _isTrueStarter(norm32, ccOrQCMask, decompQCMask);
}

3
icu4c/source/common/unorm_props_data.c
View file

@ -791,6 +791,7 @@ static const UTrie2 normTrie={
0x0,
0x30000,
0x25dc,
NULL, 0, FALSE, FALSE, 0, NULL
};
static const uint16_t extraData[15955]={
@ -2316,6 +2317,7 @@ static const UTrie2 fcdTrie={
0x0,
0x1d800,
0x17c8,
NULL, 0, FALSE, FALSE, 0, NULL
};
static const uint16_t auxTrie_index[6256]={
@ -2724,6 +2726,7 @@ static const UTrie2 auxTrie={
0x0,
0x30000,
0x186c,
NULL, 0, FALSE, FALSE, 0, NULL
};
static const uint16_t canonStartSets[7726]={

10
icu4c/source/test/cintltst/trie2test.c
View file

@ -25,6 +25,8 @@
#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
void addTrie2Test(TestNode** root);
/* Values for setting possibly overlapping, out-of-order ranges of values */
typedef struct SetRange {
UChar32 start, limit;
@ -460,10 +462,6 @@ testTrieUTF8(const char *testName,
} else {
UTRIE2_U8_PREV32(trie, s, p, value);
}
if(value!=values[i]) {
log_err("error: wrong value from UTRIE2_U8_PREV(%s)(%lx->U+%04lx): 0x%lx instead of 0x%lx\n",
testName, (unsigned long)bytes, (long)c, (long)value, (long)values[i]);
}
bytes=0;
if(value!=values[i] || i8!=(p-s)) {
int32_t k=i8;
@ -471,6 +469,10 @@ testTrieUTF8(const char *testName,
bytes=(bytes<<8)|s[k++];
}
}
if(value!=values[i]) {
log_err("error: wrong value from UTRIE2_U8_PREV(%s)(%lx->U+%04lx): 0x%lx instead of 0x%lx\n",
testName, (unsigned long)bytes, (long)c, (long)value, (long)values[i]);
}
if(i8!=(p-s)) {
log_err("error: wrong end index from UTRIE2_U8_PREV(%s)(%lx->U+%04lx): %ld != %ld\n",
testName, (unsigned long)bytes, (long)c, (long)(p-s), (long)i8);

3
icu4c/source/tools/toolutil/writesrc.c
View file

@ -191,7 +191,8 @@ usrc_writeUTrie2Struct(FILE *f,
" 0x%lx,\n" /* initialValue */
" 0x%lx,\n" /* errorValue */
" 0x%lx,\n" /* highStart */
" 0x%lx,\n", /* highValueIndex */
" 0x%lx,\n" /* highValueIndex */
" NULL, 0, FALSE, FALSE, 0, NULL",
(long)pTrie->indexLength, (long)pTrie->dataLength,
(short)pTrie->index2NullOffset, (short)pTrie->dataNullOffset,
(long)pTrie->initialValue, (long)pTrie->errorValue,