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

ICU-7447 Fix some GCC and VA compiler warnings.

Browse source 
X-SVN-Rev: 28778
This commit is contained in:
Michael Ow 2010-10-08 20:14:26 +00:00
parent d10c798d62
commit da1272de57
8 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1037,7 +1037,7 @@ ucnv_flushCache ()
int32_t pos;
int32_t tableDeletedNum = 0;
const UHashElement *e;
UErrorCode status = U_ILLEGAL_ARGUMENT_ERROR;
/*UErrorCode status = U_ILLEGAL_ARGUMENT_ERROR;*/
int32_t i, remaining;
UTRACE_ENTRY_OC(UTRACE_UCNV_FLUSH_CACHE);

6
icu4c/source/common/utrie2.cpp
View file

@ -487,7 +487,7 @@ utrie2_swap(const UDataSwapper *ds,
/* enumeration -------------------------------------------------------------- */
#define MIN(a, b) ((a)<(b) ? (a) : (b))
#define MIN_VALUE(a, b) ((a)<(b) ? (a) : (b))
/* default UTrie2EnumValue() returns the input value itself */
static uint32_t U_CALLCONV
@ -569,14 +569,14 @@ enumEitherTrie(const UTrie2 *trie,
* This special block has half the normal length.
*/
i2Block=UTRIE2_LSCP_INDEX_2_OFFSET;
tempLimit=MIN(0xdc00, limit);
tempLimit=MIN_VALUE(0xdc00, limit);
} else {
/*
* Switch back to the normal part of the index-2 table.
* Enumerate the second half of the surrogates block.
*/
i2Block=0xd800>>UTRIE2_SHIFT_2;
tempLimit=MIN(0xe000, limit);
tempLimit=MIN_VALUE(0xe000, limit);
}
} else {
/* supplementary code points */

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

@ -1466,4 +1466,5 @@ utrie2_swapAnyVersion(const UDataSwapper *ds,
return 0;
}
}
return 0;
}

2
icu4c/source/i18n/decimfmt.cpp
View file

@ -1177,7 +1177,7 @@ DecimalFormat::subformat(UnicodeString& appendTo,
DigitList& digits,
UBool isInteger) const
{
char zero = '0';
// char zero = '0';
// DigitList returns digits as '0' thru '9', so we will need to
// always need to subtract the character 0 to get the numeric value to use for indexing.

2
icu4c/source/test/cintltst/cnumtst.c
View file

@ -100,7 +100,7 @@ static void TestInt64Parse()
char* st1 = "009223372036854775808";
const int size = 21;
const int textLength = size;
/*const int textLength = size;*/
UChar text[21];

4
icu4c/source/test/cintltst/putiltst.c
View file

@ -478,11 +478,11 @@ static void Test_aestrncpy(int32_t line, const uint8_t *expect, const uint8_t *s
}
if(!uprv_memcmp(str_buf, expect, AESTRNCPY_SIZE)) {
log_verbose("\n%s:%d: OK - compared OK.", __FILE__, line);
log_verbose("\n%s:%d: expected: %s", __FILE__, line, dump_binline(expect));
log_verbose("\n%s:%d: expected: %s", __FILE__, line, dump_binline((uint8_t *)expect));
log_verbose("\n%s:%d: got : %s\n", __FILE__, line, dump_binline(str_buf));
} else {
log_err ("\n%s:%d: FAIL: uprv_aestrncpy output differs", __FILE__, line);
log_err ("\n%s:%d: expected: %s", __FILE__, line, dump_binline(expect));
log_err ("\n%s:%d: expected: %s", __FILE__, line, dump_binline((uint8_t *)expect));
log_err ("\n%s:%d: got : %s\n", __FILE__, line, dump_binline(str_buf));
}
}

7
icu4c/source/tools/ctestfw/ctest.c
View file

@ -11,6 +11,7 @@
#include <string.h>
#include <assert.h>
#include <stdarg.h>
#include <ctype.h>
#include "unicode/utrace.h"
#include "unicode/uclean.h"
@ -32,7 +33,7 @@
/**
* How many lines of scrollage can go by before we need to remind the user what the test is.
*/
#define PAGE_SIZE 25
#define PAGE_SIZE_LIMIT 25
#ifndef SHOW_TIMES
#define SHOW_TIMES 1
@ -408,7 +409,7 @@ static void iterateTestsWithLevel ( const TestNode* root,
if(!ON_LINE) { /* had some output */
int spaces = FLAG_INDENT-(depth-1);
log_testinfo_i("} %*s[OK] ", spaces, "---");
if((GLOBAL_PRINT_COUNT-myGLOBAL_PRINT_COUNT)>PAGE_SIZE) {
if((GLOBAL_PRINT_COUNT-myGLOBAL_PRINT_COUNT)>PAGE_SIZE_LIMIT) {
log_testinfo(" %s ", pathToFunction); /* in case they forgot. */
}
} else {
@ -451,7 +452,7 @@ static void iterateTestsWithLevel ( const TestNode* root,
log_testinfo_i("} "); /* TODO: summarize subtests */
if((depth>1) && (ERROR_COUNT > myERROR_COUNT)) {
log_testinfo("[%d %s in %s] ", ERROR_COUNT-myERROR_COUNT, (ERROR_COUNT-myERROR_COUNT)==1?"error":"errors", pathToFunction);
} else if((GLOBAL_PRINT_COUNT-myGLOBAL_PRINT_COUNT)>PAGE_SIZE || (depth<1)) {
} else if((GLOBAL_PRINT_COUNT-myGLOBAL_PRINT_COUNT)>PAGE_SIZE_LIMIT || (depth<1)) {
if(pathToFunction[0]) {
log_testinfo(" %s ", pathToFunction); /* in case they forgot. */
} else {

2
icu4c/source/tools/toolutil/flagparser.c
View file

@ -45,7 +45,7 @@ parseFlagsFile(const char *fileName, char **flagBuffer, int32_t flagBufferSize,
buffer = uprv_malloc(sizeof(char) * currentBufferSize);
if (buffer == NULL) {
*status = U_MEMORY_ALLOCATION_ERROR;
return;
return -1;
}
}
for (i = 0; i < numOfFlags; i++) {