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

ICU-2135 more memory fixes

Browse Source 
X-SVN-Rev: 10467
This commit is contained in:
Vladimir Weinstein 2002-12-04 00:28:06 +00:00
parent b10a91f9e3
commit 2f79227b38
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/i18n/ucol.cpp
View File

@ -1160,7 +1160,7 @@ inline UBool collIterFCD(collIterate *collationSource) {
/* some more sofisticated and slower functions are invoked */
static
inline uint32_t ucol_IGetNextCE(const UCollator *coll, collIterate *collationSource, UErrorCode *status) {
uint32_t order;
uint32_t order = 0;
if (collationSource->CEpos > collationSource->toReturn) { /* Are there any CEs from previous expansions? */
order = *(collationSource->toReturn++); /* if so, return them */
if(collationSource->CEpos == collationSource->toReturn) {
@ -1169,7 +1169,7 @@ inline uint32_t ucol_IGetNextCE(const UCollator *coll, collIterate *collationSou
return order;
}
UChar ch;
UChar ch = 0;
for (;;) /* Loop handles case when incremental normalize switches */
{ /* to or from the side buffer / original string, and we */
@ -1497,7 +1497,7 @@ inline uint32_t ucol_IGetPrevCE(const UCollator *coll, collIterate *data,
}
}
else {
UChar ch;
UChar ch = 0;
/*
Loop handles case when incremental normalize switches to or from the
side buffer / original string, and we need to start again to get the
@ -6653,7 +6653,7 @@ ucol_strcoll( const UCollator *coll,
}
if(coll->latinOneUse) {
if (*source&0xff00 || *target&0xff00) { // source or target start with non-latin-1
if ((sourceLength > 0 && *source&0xff00) || (targetLength > 0 && *target&0xff00)) { // source or target start with non-latin-1
return ucol_strcollRegular(coll, source, sourceLength, target, targetLength, &status);
} else {
return ucol_strcollUseLatin1(coll, source, sourceLength, target, targetLength, &status);

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

@ -424,7 +424,7 @@ ucol_tok_getNextArgument(const UChar *start, const UChar *end,
ucol_uprv_tok_initData();
while(u_isWhitespace(*start) && start < end) { /* eat whitespace */
while(start < end && u_isWhitespace(*start)) { /* eat whitespace */
start++;
}
if(start >= end) {

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

@ -308,7 +308,7 @@ void DateFormatRoundTripTest::test(DateFormat *fmt, const Locale &origLocale, UB
(j > 0 && s[j] == s[j-1]?" s==":""));
}
}
delete d;
delete[] d;
delete[] s;
}
/*}

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

@ -1146,7 +1146,7 @@ main(int argc, char* argv[])
CalendarTimeZoneTest::cleanup();
#endif
delete _testDataPath;
delete[] _testDataPath;
_testDataPath = 0;
fprintf(stdout, "\n--------------------------------------\n");