organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-15 01:42:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-5032 Undo last two checkins. They were invalid.

Browse source 
X-SVN-Rev: 19491
This commit is contained in:
George Rhoten 2006-03-30 20:08:34 +00:00
parent 714c0ec3c1
commit 3318c119ba
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
icu4c/source/common/uiter.cpp
View file

@ -180,8 +180,11 @@ stringIteratorGetState(const UCharIterator *iter) {
static void U_CALLCONV
stringIteratorSetState(UCharIterator *iter, uint32_t state, UErrorCode *pErrorCode) {
/* Some parameter checking has already been done by uiter_setState */
if((int32_t)state<iter->start || iter->limit<(int32_t)state) {
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
/* do nothing */
} else if(iter==NULL) {
*pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
} else if((int32_t)state<iter->start || iter->limit<(int32_t)state) {
*pErrorCode=U_INDEX_OUTOFBOUNDS_ERROR;
} else {
iter->index=(int32_t)state;
@ -437,8 +440,9 @@ characterIteratorGetState(const UCharIterator *iter) {
static void U_CALLCONV
characterIteratorSetState(UCharIterator *iter, uint32_t state, UErrorCode *pErrorCode) {
/* Some parameter checking has already been done by uiter_setState */
if(iter->context==NULL) {
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
/* do nothing */
} else if(iter==NULL || iter->context==NULL) {
*pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
} else if((int32_t)state<((CharacterIterator *)(iter->context))->startIndex() || ((CharacterIterator *)(iter->context))->endIndex()<(int32_t)state) {
*pErrorCode=U_INDEX_OUTOFBOUNDS_ERROR;
@ -960,8 +964,11 @@ utf8IteratorSetState(UCharIterator *iter,
uint32_t state,
UErrorCode *pErrorCode)
{
/* Some parameter checking has already been done by uiter_setState */
if(state==utf8IteratorGetState(iter)) {
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
/* do nothing */
} else if(iter==NULL) {
*pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
} else if(state==utf8IteratorGetState(iter)) {
/* setting to the current state: no-op */
} else {
int32_t index=(int32_t)(state>>1); /* UTF-8 index */
@ -1111,4 +1118,4 @@ uiter_setState(UCharIterator *iter, uint32_t state, UErrorCode *pErrorCode) {
}
}
U_CDECL_END
U_CDECL_END