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

ICU-7708 compiler warnings for 4.5.1 (batch 1)

Browse Source 
X-SVN-Rev: 28103
This commit is contained in:
Steven R. Loomis 2010-05-25 22:17:12 +00:00
parent edcaca307a
commit a1ea70071b
34 changed files with 131 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/common/locid.cpp
View File

@ -1090,7 +1090,7 @@ Locale::getBaseName() const
// the computation of variantBegin leaves it equal to the length
// of fullName if there is no variant. It should instead be
// the length of the baseName. Patch around this for now.
if (variantBegin == uprv_strlen(fullName)) {
if (variantBegin == (int32_t)uprv_strlen(fullName)) {
((Locale*)this)->variantBegin = baseNameSize;
}
}

8
icu4c/source/common/normalizer2impl.cpp
View File

@ -249,7 +249,7 @@ Normalizer2Impl::~Normalizer2Impl() {
UBool U_CALLCONV
Normalizer2Impl::isAcceptable(void *context,
const char *type, const char *name,
const char * /* type */, const char * /*name*/,
const UDataInfo *pInfo) {
if(
pInfo->size>=20 &&
@ -336,7 +336,7 @@ enumPropertyStartsRange(const void *context, UChar32 start, UChar32 /*end*/, uin
U_CDECL_END
void
Normalizer2Impl::addPropertyStarts(const USetAdder *sa, UErrorCode &errorCode) const {
Normalizer2Impl::addPropertyStarts(const USetAdder *sa, UErrorCode & /*errorCode*/) const {
/* add the start code point of each same-value range of each trie */
utrie2_enum(normTrie, NULL, enumPropertyStartsRange, sa);
@ -1356,7 +1356,7 @@ enumRangeHandler(const void *context, UChar32 start, UChar32 end, uint32_t value
// Collect (OR together) the FCD values for a range of supplementary characters,
// for their lead surrogate code unit.
static UBool U_CALLCONV
enumRangeOrValue(const void *context, UChar32 start, UChar32 end, uint32_t value) {
enumRangeOrValue(const void *context, UChar32 /*start*/, UChar32 /*end*/, uint32_t value) {
*((uint32_t *)context)|=value;
return TRUE;
}
@ -1678,7 +1678,7 @@ unorm2_swap(const UDataSwapper *ds,
if(length>=0) {
length-=headerSize;
if(length<sizeof(indexes)) {
if(length<(int32_t)sizeof(indexes)) {
udata_printError(ds, "unorm2_swap(): too few bytes (%d after header) for Normalizer2 data\n",
length);
*pErrorCode=U_INDEX_OUTOFBOUNDS_ERROR;

6
icu4c/source/common/resbund.cpp
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1997-2008, International Business Machines
* Copyright (C) 1997-2010, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -360,7 +360,7 @@ UnicodeString ResourceBundle::getStringEx(const char* key, UErrorCode& status) c
const char*
ResourceBundle::getVersionNumber() const
{
return ures_getVersionNumber(fResource);
return ures_getVersionNumberInternal(fResource);
}
void ResourceBundle::getVersion(UVersionInfo versionInfo) const {
@ -373,7 +373,7 @@ const Locale &ResourceBundle::getLocale(void) const
UMTX_CHECK(NULL, (fLocale == NULL), needInit);
if(needInit) {
UErrorCode status = U_ZERO_ERROR;
const char *localeName = ures_getLocale(fResource, &status);
const char *localeName = ures_getLocaleInternal(fResource, &status);
Locale *tLocale = new Locale(localeName);
// Null pointer check
if (tLocale == NULL) {

1
icu4c/source/common/uchar.c
View File

@ -29,6 +29,7 @@
#include "utrie2.h"
#include "udataswp.h"
#include "uprops.h"
#include "ustr_imp.h"
#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))

4
icu4c/source/common/ucnv_lmb.c
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2000-2009, International Business Machines
* Copyright (C) 2000-2010, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: ucnv_lmb.cpp
@ -952,7 +952,7 @@ _LMBCSFromUnicode(UConverterFromUnicodeArgs* args,
uprv_memset(groups_tried, 0, sizeof(groups_tried));
/* check for non-default optimization group (Strategy 3A )*/
if (extraInfo->OptGroup != 1 && ULMBCS_AMBIGUOUS_MATCH(group, extraInfo->OptGroup))
if ((extraInfo->OptGroup != 1) && (ULMBCS_AMBIGUOUS_MATCH(group, extraInfo->OptGroup)))
{
/*zhujin: upgrade, merge #39299 here (Lotus) */
/*To make R5 compatible translation, look for exceptional group first for non-DBCS*/

2
icu4c/source/common/ucnv_u16.c
View File

@ -1293,7 +1293,7 @@ _UTF16Open(UConverter *cnv,
* (See ucnv_createConverterFromSharedData() in ucnv_bld.c.)
* UTF-16,version=2 fromUnicode() always writes a big-endian byte stream.
*/
cnv->sharedData=&_UTF16v2Data;
cnv->sharedData=(UConverterSharedData*)&_UTF16v2Data;
uprv_memcpy(cnv->subChars, _UTF16v2Data.staticData->subChar, UCNV_MAX_SUBCHAR_LEN);
}
_UTF16Reset(cnv, UCNV_RESET_BOTH);

2
icu4c/source/common/ucnvmbcs.c
View File

@ -3939,7 +3939,7 @@ ucnv_MBCSFromUnicodeWithOffsets(UConverterFromUnicodeArgs *pArgs,
uint32_t asciiRoundtrips;
uint32_t value;
uint8_t si_value[2], so_value[2], si_value_length, so_value_length;
int32_t length, prevLength;
int32_t length = 0, prevLength;
uint8_t unicodeMask;
cnv=pArgs->converter;

8
icu4c/source/common/ucol_swp.cpp
View File

@ -47,7 +47,7 @@ utrie_swap(const UDataSwapper *ds,
}
/* setup and swapping */
if(length>=0 && length<sizeof(UTrieHeader)) {
if(length>=0 && (uint32_t)length<sizeof(UTrieHeader)) {
*pErrorCode=U_INDEX_OUTOFBOUNDS_ERROR;
return 0;
}
@ -108,7 +108,7 @@ ucol_looksLikeCollationBinary(const UDataSwapper *ds,
const void *inData, int32_t length) {
const uint8_t *inBytes;
const UCATableHeader *inHeader;
UCATableHeader header={ 0 };
UCATableHeader header={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, 0 };
if(ds==NULL || inData==NULL || length<-1) {
return FALSE;
@ -155,7 +155,7 @@ ucol_swapBinary(const UDataSwapper *ds,
const UCATableHeader *inHeader;
UCATableHeader *outHeader;
UCATableHeader header={ 0 };
UCATableHeader header={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, 0 };
uint32_t count;
@ -363,7 +363,7 @@ ucol_swapInverseUCA(const UDataSwapper *ds,
const InverseUCATableHeader *inHeader;
InverseUCATableHeader *outHeader;
InverseUCATableHeader header={ 0 };
InverseUCATableHeader header={ 0,0,0,0,0,{0,0,0,0},{0,0,0,0,0,0,0,0} };
/* udata_swapDataHeader checks the arguments */
headerSize=udata_swapDataHeader(ds, inData, length, outData, pErrorCode);

4
icu4c/source/common/unorm.cpp
View File

@ -92,19 +92,19 @@ static UVersionInfo dataVersion={ 0, 0, 0, 0 };
U_CDECL_BEGIN
#if !UNORM_HARDCODE_DATA
static UBool U_CALLCONV
unorm_cleanup(void) {
#if !UNORM_HARDCODE_DATA
if(normData!=NULL) {
udata_close(normData);
normData=NULL;
}
dataErrorCode=U_ZERO_ERROR;
haveNormData=0;
#endif
return TRUE;
}
#endif
#if !UNORM_HARDCODE_DATA

2
icu4c/source/common/uprops.cpp
View File

@ -444,7 +444,7 @@ u_getIntPropertyValue(UChar32 c, UProperty which) {
}
U_CAPI int32_t U_EXPORT2
u_getIntPropertyMinValue(UProperty which) {
u_getIntPropertyMinValue(UProperty /*which*/) {
return 0; /* all binary/enum/int properties have a minimum value of 0 */
}

34
icu4c/source/common/uresbund.c
View File

@ -1905,8 +1905,8 @@ ures_getUTF8StringByKey(const UResourceBundle *resB,
* INTERNAL: Get the name of the first real locale (not placeholder)
* that has resource bundle data.
*/
U_CAPI const char* U_EXPORT2
ures_getLocale(const UResourceBundle* resourceBundle, UErrorCode* status)
U_INTERNAL const char* U_EXPORT2
ures_getLocaleInternal(const UResourceBundle* resourceBundle, UErrorCode* status)
{
if (status==NULL || U_FAILURE(*status)) {
return NULL;
@ -1919,6 +1919,14 @@ ures_getLocale(const UResourceBundle* resourceBundle, UErrorCode* status)
}
}
U_CAPI const char* U_EXPORT2
ures_getLocale(const UResourceBundle* resourceBundle,
UErrorCode* status)
{
return ures_getLocaleInternal(resourceBundle, status);
}
U_CAPI const char* U_EXPORT2
ures_getLocaleByType(const UResourceBundle* resourceBundle,
ULocDataLocaleType type,
@ -2154,8 +2162,18 @@ ures_countArrayItems(const UResourceBundle* resourceBundle,
}
}
U_CAPI const char* U_EXPORT2
ures_getVersionNumber(const UResourceBundle* resourceBundle)
/**
* Internal function.
* Return the version number associated with this ResourceBundle as a string.
*
* @param resourceBundle The resource bundle for which the version is checked.
* @return A version number string as specified in the resource bundle or its parent.
* The caller does not own this string.
* @see ures_getVersion
* @internal
*/
U_INTERNAL const char* U_EXPORT2
ures_getVersionNumberInternal(const UResourceBundle *resourceBundle)
{
if (!resourceBundle) return NULL;
@ -2198,10 +2216,16 @@ ures_getVersionNumber(const UResourceBundle* resourceBundle)
return resourceBundle->fVersion;
}
U_CAPI const char* U_EXPORT2
ures_getVersionNumber(const UResourceBundle* resourceBundle)
{
return ures_getVersionNumberInternal(resourceBundle);
}
U_CAPI void U_EXPORT2 ures_getVersion(const UResourceBundle* resB, UVersionInfo versionInfo) {
if (!resB) return;
u_versionFromString(versionInfo, ures_getVersionNumber(resB));
u_versionFromString(versionInfo, ures_getVersionNumberInternal(resB));
}
/** Tree support functions *******************************/

29
icu4c/source/common/uresimp.h
View File

@ -242,4 +242,33 @@ ures_getVersionByKey(const UResourceBundle *resB,
UErrorCode *status);
/**
* Internal function.
* Return the version number associated with this ResourceBundle as a string.
*
* @param resourceBundle The resource bundle for which the version is checked.
* @return A version number string as specified in the resource bundle or its parent.
* The caller does not own this string.
* @see ures_getVersion
* @internal
*/
U_INTERNAL const char* U_EXPORT2
ures_getVersionNumberInternal(const UResourceBundle *resourceBundle);
/**
* Return the name of the Locale associated with this ResourceBundle. This API allows
* you to query for the real locale of the resource. For example, if you requested
* "en_US_CALIFORNIA" and only "en_US" bundle exists, "en_US" will be returned.
* For subresources, the locale where this resource comes from will be returned.
* If fallback has occured, getLocale will reflect this.
*
* @param resourceBundle resource bundle in question
* @param status just for catching illegal arguments
* @return A Locale name
* @deprecated ICU 2.8 Use ures_getLocaleByType instead.
*/
U_INTERNAL const char* U_EXPORT2
ures_getLocaleInternal(const UResourceBundle* resourceBundle,
UErrorCode* status);
#endif /*URESIMP_H*/

2
icu4c/source/common/ustrtrns.c
View File

@ -1507,7 +1507,7 @@ u_strToJavaModifiedUTF8(
int32_t srcLength,
UErrorCode *pErrorCode) {
int32_t reqLength=0;
uint32_t ch=0,ch2=0;
uint32_t ch=0;
uint8_t *pDest = (uint8_t *)dest;
uint8_t *pDestLimit = pDest + destCapacity;
const UChar *pSrcLimit;

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

@ -143,7 +143,7 @@ utrie2_openFromSerialized(UTrie2ValueBits valueBits,
}
/* enough data for a trie header? */
if(length<sizeof(UTrie2Header)) {
if(length<(int32_t)sizeof(UTrie2Header)) {
*pErrorCode=U_INVALID_FORMAT_ERROR;
return 0;
}
@ -412,7 +412,7 @@ utrie2_swap(const UDataSwapper *ds,
}
/* setup and swapping */
if(length>=0 && length<sizeof(UTrie2Header)) {
if(length>=0 && length<(int32_t)sizeof(UTrie2Header)) {
*pErrorCode=U_INDEX_OUTOFBOUNDS_ERROR;
return 0;
}
@ -487,7 +487,7 @@ utrie2_swap(const UDataSwapper *ds,
/* default UTrie2EnumValue() returns the input value itself */
static uint32_t U_CALLCONV
enumSameValue(const void *context, uint32_t value) {
enumSameValue(const void * /*context*/, uint32_t value) {
return value;
}

2
icu4c/source/i18n/digitlst.cpp
View File

@ -541,7 +541,7 @@ void DigitList::getDecimal(CharString &str, UErrorCode &status) {
}
U_ASSERT(capacity >= maxLength);
uprv_decNumberToString(this->fDecNumber, buffer);
U_ASSERT(uprv_strlen(buffer) <= maxLength);
U_ASSERT((int32_t)uprv_strlen(buffer) <= maxLength);
str.append(buffer, -1, status);
}

1
icu4c/source/i18n/smpdtfmt.cpp
View File

@ -1797,7 +1797,6 @@ SimpleDateFormat::parse(const UnicodeString& text, Calendar& cal, ParsePosition&
int32_t abutStart = 0;
int32_t abutPass = 0;
UBool inQuote = FALSE;
UBool skipwhsp = FALSE;
const UnicodeString numericFormatChars(NUMERIC_FORMAT_CHARS);

3
icu4c/source/i18n/ucol_imp.h
View File

@ -373,6 +373,9 @@ struct UCollationElements : public U_NAMESPACE_QUALIFIER UMemory
U_NAMESPACE_QUALIFIER UCollationPCE *pce;
};
#else
/*opaque type*/
struct UCollationElements;
#endif
U_CAPI void U_EXPORT2

2
icu4c/source/i18n/ucol_wgt.cpp
View File

@ -120,7 +120,7 @@ lengthenRange(WeightRange *range, uint32_t maxByte, uint32_t countBytes) {
/* for uprv_sortArray: sort ranges in weight order */
static int32_t U_CALLCONV
compareRanges(const void *context, const void *left, const void *right) {
compareRanges(const void * /*context*/, const void *left, const void *right) {
uint32_t l, r;
l=((const WeightRange *)left)->start;

4
icu4c/source/i18n/zonemeta.cpp
View File

@ -191,7 +191,7 @@ ZoneMeta::getCanonicalSystemID(const UnicodeString &tzid, UnicodeString &systemI
// check canonical mapping in CLDR
char id[ZID_KEY_MAX];
int32_t len = u_strlen(canonical);
if (len < sizeof(id)) {
if (len < (int32_t)sizeof(id)) {
u_UCharsToChars(canonical, id, len + 1 /* include the terminator */);
// replace '/' with ':'
char *p = id;
@ -310,7 +310,7 @@ ZoneMeta::getSingleCountry(const UnicodeString &tzid, UnicodeString &country) {
getCanonicalSystemID(*id, canonical, status);
if (U_SUCCESS(status)) {
// check if there are any other canonical zone in the group
while (id = ids->snext(status)) {
while ((id = ids->snext(status))!=NULL) {
getCanonicalSystemID(*id, tmp, status);
if (U_FAILURE(status)) {
break;

6
icu4c/source/test/cintltst/ccapitst.c
View File

@ -2698,13 +2698,13 @@ static void TestConvertExFromUTF8_C5F0() {
UErrorCode errorCode;
int32_t i;
static const char bad_utf8[2]={ 0xC5, 0xF0 };
static const unsigned char bad_utf8[2]={ 0xC5, 0xF0 };
/* Expect "&#65533;&#65533;" (2x U+FFFD as decimal NCRs) */
static const char twoNCRs[16]={
static const unsigned char twoNCRs[16]={
0x26, 0x23, 0x36, 0x35, 0x35, 0x33, 0x33, 0x3B,
0x26, 0x23, 0x36, 0x35, 0x35, 0x33, 0x33, 0x3B
};
static const char twoFFFD[6]={
static const unsigned char twoFFFD[6]={
(char)0xef, (char)0xbf, (char)0xbd,
(char)0xef, (char)0xbf, (char)0xbd
};

15
icu4c/source/test/cintltst/nucnvtst.c
View File

@ -65,7 +65,12 @@ static void TestISO_2022_JP_2(void);
static void TestISO_2022_KR(void);
static void TestISO_2022_KR_1(void);
static void TestISO_2022_CN(void);
#if 0
/*
* ICU 4.4 (ticket #7314) removes mappings for CNS 11643 planes 3..7
*/
static void TestISO_2022_CN_EXT(void);
#endif
static void TestJIS(void);
static void TestHZ(void);
#endif
@ -78,7 +83,12 @@ static void TestGB18030(void);
static void TestLMBCS(void);
static void TestJitterbug255(void);
static void TestEBCDICUS4XML(void);
#if 0
/*
* ICU 4.4 (ticket #7314) removes mappings for CNS 11643 planes 3..7
*/
static void TestJitterbug915(void);
#endif
static void TestISCII(void);
static void TestCoverageMBCS(void);
@ -4235,6 +4245,10 @@ TestJIS(){
}
#if 0
ICU 4.4 (ticket #7314) removes mappings for CNS 11643 planes 3..7
static void TestJitterbug915(){
/* tests for roundtripping of the below sequence
\x1b$)G\x0E#!#"###$#%#&#'#(#)#*#+ / *plane 1 * /
@ -4422,6 +4436,7 @@ TestISO_2022_CN_EXT() {
free(cBuf);
free(offsets);
}
#endif
static void
TestISO_2022_CN() {

4
icu4c/source/test/intltest/apicoll.cpp
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2009, International Business Machines Corporation and
* Copyright (c) 1997-2010, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
//===============================================================================
@ -137,7 +137,7 @@ CollationAPITest::TestProperty(/* char* par */)
doAssert((col->compare("blackbird", "black-bird") == Collator::GREATER), "black-bird > blackbird comparison failed");
doAssert((col->compare("black bird", "black-bird") == Collator::LESS), "black bird > black-bird comparison failed");
doAssert((col->compare("Hello", "hello") == Collator::GREATER), "Hello > hello comparison failed");
doAssert((col->compare("","",success) == Collator::EQUAL), "Comparison between empty strings failed");
doAssert((col->compare("","",success) == UCOL_EQUAL), "Comparison between empty strings failed");
doAssert((col->compareUTF8("\x61\x62\xc3\xa4", "\x61\x62\xc3\x9f", success) == UCOL_LESS), "ab a-umlaut < ab sharp-s UTF-8 comparison failed");
success = U_ZERO_ERROR;

6
icu4c/source/test/intltest/bidiconf.cpp
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2009, International Business Machines
* Copyright (C) 2009-2010, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -65,7 +65,7 @@ extern IntlTest *createBiDiConformanceTest() {
return new BiDiConformanceTest();
}
void BiDiConformanceTest::runIndexedTest(int32_t index, UBool exec, const char *&name, char *par) {
void BiDiConformanceTest::runIndexedTest(int32_t index, UBool exec, const char *&name, char * /*par*/) {
if(exec) {
logln("TestSuite BiDiConformanceTest: ");
}
@ -180,7 +180,7 @@ static const UChar charFromBiDiClass[U_CHAR_DIRECTION_COUNT]={
U_CDECL_BEGIN
static UCharDirection U_CALLCONV
biDiConfUBiDiClassCallback(const void *context, UChar32 c) {
biDiConfUBiDiClassCallback(const void * /*context*/, UChar32 c) {
for(int i=0; i<U_CHAR_DIRECTION_COUNT; ++i) {
if(c==charFromBiDiClass[i]) {
return (UCharDirection)i;

2
icu4c/source/test/intltest/callimts.cpp
View File

@ -163,7 +163,7 @@ CalendarLimitTest::TestLimits(void) {
{"coptic", FALSE, DEFAULT_START, DEFAULT_END},
{"ethiopic", FALSE, DEFAULT_START, DEFAULT_END},
{"ethiopic-amete-alem", FALSE, DEFAULT_START, DEFAULT_END},
{NULL, FALSE, 0.0}
{NULL, FALSE, 0, 0}
};
int16_t i = 0;

2
icu4c/source/test/intltest/dcfmtest.cpp
View File

@ -409,7 +409,7 @@ void DecimalFormatTest::execFormatTest(int32_t lineNum,
Formattable fmtbl;
fmtbl.setDecimalNumber(spInput, status);
NumberFormat &nfmtr = fmtr;
//NumberFormat &nfmtr = fmtr;
fmtr.format(fmtbl, result, NULL, status);
if (U_FAILURE(status)) {

2
icu4c/source/test/intltest/numfmtst.cpp
View File

@ -2817,7 +2817,7 @@ NumberFormatTest::TestCurrencyFormatForMixParsing() {
"US dollars1,234.56",
"1,234.56 US dollars"
};
const CurrencyAmount* curramt;
const CurrencyAmount* curramt = NULL;
for (uint32_t i = 0; i < sizeof(formats)/sizeof(formats[0]); ++i) {
UnicodeString stringToBeParsed = ctou(formats[i]);
Formattable result;

4
icu4c/source/test/intltest/rbbitst.cpp
View File

@ -1959,8 +1959,8 @@ void RBBITest::TestTailoredBreaks() {
Locale rootLocale = Locale("root");
for (tbItemPtr = tbItems; tbItemPtr->escapedText != NULL; ++tbItemPtr) {
Locale testLocale = Locale(tbItemPtr->locale);
BreakIterator * tailoredBrkiter;
BreakIterator * rootBrkiter;
BreakIterator * tailoredBrkiter = NULL;
BreakIterator * rootBrkiter = NULL;
UErrorCode status = U_ZERO_ERROR;
switch (tbItemPtr->type) {
case UBRK_CHARACTER:

4
icu4c/source/test/intltest/regcoll.cpp
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2009, International Business Machines Corporation and
* Copyright (c) 1997-2010, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -1081,7 +1081,7 @@ void CollationRegressionTest::Test4146160(/* char* par */)
// Ticket 7189
//
// nextSortKeyPart incorrect for EO_S1 collation
static int32_t calcKeyIncremental(UCollator *coll, const UChar* text, int32_t len, uint8_t *keyBuf, int32_t keyBufLen, UErrorCode& status) {
static int32_t calcKeyIncremental(UCollator *coll, const UChar* text, int32_t len, uint8_t *keyBuf, int32_t /*keyBufLen*/, UErrorCode& status) {
UCharIterator uiter;
uint32_t state[2] = { 0, 0 };
int32_t keyLen;

8
icu4c/source/test/intltest/selfmts.cpp
View File

@ -190,7 +190,7 @@ void SelectFormatTest::selectFormatAPITest(/*char *par*/)
{
int numOfConstructors =3;
UErrorCode status[3];
SelectFormat* selFmt[3];
SelectFormat* selFmt[3] = { NULL, NULL, NULL };
// ========= Test constructors
logln("SelectFormat API test: Testing SelectFormat constructors ...");
@ -221,7 +221,13 @@ void SelectFormatTest::selectFormatAPITest(/*char *par*/)
if ( *selFmt[1] != *selFmt[0] ) {
errln("ERROR: SelectFormat API test clone test failed!");
}
} else {
errln("ERROR: SelectFormat API test clone test failed with NULL!");
return;
}
} else {
errln("ERROR: could not create [0]: %s\n", u_errorName(status[0]));
return;
}
// ======= Test assignment operator && == operator.

21
icu4c/source/test/intltest/tstnorm.cpp
View File

@ -1705,27 +1705,6 @@ initExpectedSkippables(UnicodeSet skipSets[UNORM_MODE_COUNT]) {
, ""), errorCode);
}
U_CDECL_BEGIN
// USetAdder implementation
// Does not use uset.h to reduce code dependencies
static void U_CALLCONV
_set_add(USet *set, UChar32 c) {
uset_add(set, c);
}
static void U_CALLCONV
_set_addRange(USet *set, UChar32 start, UChar32 end) {
uset_addRange(set, start, end);
}
static void U_CALLCONV
_set_addString(USet *set, const UChar *str, int32_t length) {
uset_addString(set, str, length);
}
U_CDECL_END
void
BasicNormalizerTest::TestSkippable() {
UnicodeSet diff, skipSets[UNORM_MODE_COUNT], expectSets[UNORM_MODE_COUNT];

1
icu4c/source/test/intltest/tzfmttst.cpp
View File

@ -287,7 +287,6 @@ public:
}
int32_t testCounts = 0;
UBool done = false;
while (true) {
umtx_lock(NULL); // Lock to increment the index

6
icu4c/source/tools/ctestfw/ucln_ct.c
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2007-2009, International Business Machines Corporation and
* Copyright (c) 2007-2010, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -9,8 +9,8 @@
#define UCLN_TYPE UCLN_CTESTFW
#include "ucln_imp.h"
int dummyFunction();
int dummyFunction()
int dummyFunction(void);
int dummyFunction(void)
{
/* this is here to prevent the compiler from complaining about an empty file */
return 0;

1
icu4c/source/tools/icuinfo/icuinfo.cpp
View File

@ -81,7 +81,6 @@ void cmd_millis()
void cmd_version(UBool noLoad)
{
UVersionInfo icu;
UErrorCode status = U_ZERO_ERROR;
char str[200];
printf("<ICUINFO>\n");
printf("International Components for Unicode for C/C++\n");

4
icu4c/source/tools/toolutil/ucln_tu.c
View File

@ -9,8 +9,8 @@
#define UCLN_TYPE UCLN_TOOLUTIL
#include "ucln_imp.h"
int dummyFunction();
int dummyFunction()
int dummyFunction(void);
int dummyFunction(void)
{
/* this is here to prevent the compiler from complaining about an empty file */
return 0;