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

ICU-845 add review comments

Browse Source 
X-SVN-Rev: 9514
This commit is contained in:
Ram Viswanadha 2002-08-01 18:56:29 +00:00
parent 16aadd1cc0
commit 22dbbac8ae
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3256,17 +3256,18 @@ unorm_concatenate(const UChar *left, int32_t leftLength,
pErrorCode);
leftBoundary=iter.index;
if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) {
*pErrorCode=U_ZERO_ERROR;
if(!u_growBufferFromStatic(stackBuffer, &buffer, &bufferCapacity, 2*bufferLength, 0)) {
*pErrorCode=U_MEMORY_ALLOCATION_ERROR;
/* dont need to cleanup here since
* u_growBufferFromStatic frees buffer if(buffer!=stackBuffer)
*/
return 0;
}
/* just copy from the left string: we know the boundary already */
uprv_memcpy(buffer, left+leftBoundary, bufferLength*U_SIZEOF_UCHAR);
}
if(U_FAILURE(*pErrorCode)) {
return 0;
}
/*
* find a normalization boundary at the beginning of the right string
@ -3280,17 +3281,19 @@ unorm_concatenate(const UChar *left, int32_t leftLength,
FALSE, NULL,
pErrorCode);
if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) {
*pErrorCode=U_ZERO_ERROR;
if(!u_growBufferFromStatic(stackBuffer, &buffer, &bufferCapacity, bufferLength+rightBoundary, 0)) {
*pErrorCode=U_MEMORY_ALLOCATION_ERROR;
/* dont need to cleanup here since
* u_growBufferFromStatic frees buffer if(buffer!=stackBuffer)
*/
return 0;
}
/* just copy from the right string: we know the boundary already */
uprv_memcpy(buffer+bufferLength, right, rightBoundary*U_SIZEOF_UCHAR);
}
if(U_FAILURE(*pErrorCode)) {
return 0;
}
bufferLength+=rightBoundary;
/* copy left[0..leftBoundary[ to dest */
@ -3311,7 +3314,10 @@ unorm_concatenate(const UChar *left, int32_t leftLength,
mode, (UBool)((options&(UNORM_IGNORE_HANGUL|1))!=0),
pErrorCode);
}
/*
* only errorCode that is expected is a U_BUFFER_OVERFLOW_ERROR
* so we dont check for the error code here..just let it pass through
*/
/* concatenate right[rightBoundary..rightLength[ to dest */
right+=rightBoundary;
rightLength-=rightBoundary;