ICU-5966 Fix some compiler warnings.
X-SVN-Rev: 23017
This commit is contained in:
parent
69645b44fd
commit
0dda41de85
@ -1068,7 +1068,6 @@ DateFormatSymbols::setZoneStrings(const UnicodeString* const *strings, int32_t r
|
||||
// since deleting a 2-d array is a pain in the butt, we offload that task to
|
||||
// a separate function
|
||||
disposeZoneStrings();
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
// we always own the new list, which we create here (we duplicate rather
|
||||
// than adopting the list passed in)
|
||||
fZoneStringsRowCount = rowCount;
|
||||
|
@ -752,7 +752,7 @@ static void uprv_uca_unsafeCPAddCCNZ(tempUCATable *t, UErrorCode *status) {
|
||||
(UTF_IS_LEAD(c) && fcd != 0)) {// c is a leading surrogate with some FCD data
|
||||
if (buildCMTable) {
|
||||
uint32_t cClass = fcd & 0xff;
|
||||
uint32_t temp=(cClass<<8)+index[cClass];
|
||||
//uint32_t temp=(cClass<<8)+index[cClass];
|
||||
cm[(cClass<<8)+index[cClass]] = c; //
|
||||
index[cClass]++;
|
||||
count++;
|
||||
@ -1728,7 +1728,6 @@ uprv_uca_addMultiCMContractions(tempUCATable *t,
|
||||
|
||||
for (int32_t j=0; j < maxComp; j++) {
|
||||
int32_t count=0;
|
||||
int32_t newClass=0;
|
||||
do {
|
||||
if ( count == 0 ) { // Decompose the saved precomposed char.
|
||||
UChar temp[2];
|
||||
@ -1890,7 +1889,6 @@ uprv_uca_canonicalClosure(tempUCATable *t,
|
||||
context.noOfClosures = 0;
|
||||
UCAElements el;
|
||||
UColToken *tok;
|
||||
UColToken *expt = NULL;
|
||||
uint32_t i = 0, j = 0;
|
||||
UChar baseChar, firstCM;
|
||||
const uint16_t *fcdTrieData = unorm_getFCDTrie(status);
|
||||
|
@ -439,17 +439,18 @@ inline void initialize(UStringSearch *strsrch, UErrorCode *status)
|
||||
* @param end target text end offset
|
||||
*/
|
||||
static
|
||||
void checkBreakBoundary(const UStringSearch *strsrch, int32_t *start,
|
||||
void checkBreakBoundary(const UStringSearch *strsrch, int32_t * /*start*/,
|
||||
int32_t *end)
|
||||
{
|
||||
#if !UCONFIG_NO_BREAK_ITERATION
|
||||
UBreakIterator *breakiterator = strsrch->search->_breakIter_;
|
||||
if (breakiterator) {
|
||||
int32_t matchend = *end;
|
||||
int32_t matchstart = *start;
|
||||
//int32_t matchstart = *start;
|
||||
|
||||
if (!ubrk_isBoundary(breakiterator, matchend))
|
||||
if (!ubrk_isBoundary(breakiterator, matchend)) {
|
||||
*end = ubrk_following(breakiterator, matchend);
|
||||
}
|
||||
|
||||
/* Check the start of the matched text to make sure it doesn't have any accents
|
||||
* before it. This code may not be necessary and so it is commented out */
|
||||
@ -741,7 +742,7 @@ UBool checkExtraMatchAccents(const UStringSearch *strsrch, int32_t start,
|
||||
uint32_t firstce = strsrch->pattern.CE[0];
|
||||
UBool ignorable = TRUE;
|
||||
uint32_t ce = UCOL_IGNORABLE;
|
||||
while (U_SUCCESS(*status) && ce != firstce && ce != UCOL_NULLORDER) {
|
||||
while (U_SUCCESS(*status) && ce != firstce && ce != (uint32_t)UCOL_NULLORDER) {
|
||||
offset = ucol_getOffset(coleiter);
|
||||
if (ce != firstce && ce != UCOL_IGNORABLE) {
|
||||
ignorable = FALSE;
|
||||
|
@ -200,7 +200,6 @@ ZoneMeta::initialize(void) {
|
||||
if (initialized) {
|
||||
return;
|
||||
}
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
|
||||
// Initialize hash tables
|
||||
Hashtable *tmpCanonicalMap = createCanonicalMap();
|
||||
|
Loading…
Reference in New Issue
Block a user