organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-7187 avoid comparison of (pointer+unsigned)>pointer which can be optimized away; not necessary anyway with use of U_MAX_PTR(pointer)

Browse source 
X-SVN-Rev: 28951
This commit is contained in:
Markus Scherer 2010-10-28 23:32:22 +00:00
parent 46ee80daa9
commit 8f93a3e07a
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
icu4c/source/common/unistr_cnv.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 1999-2009, International Business Machines
* Copyright (C) 1999-2010, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -161,15 +161,11 @@ UnicodeString::extract(int32_t start,
// Assume that the capacity is real and a limit pointer won't wrap around.
capacity = (int32_t)dstSize;
} else {
char *targetLimit = target + 0x7fffffff;
if(targetLimit < target) {
// Pin the capacity so that a limit pointer does not wrap around.
targetLimit = (char *)U_MAX_PTR(target);
capacity = (int32_t)(targetLimit - target);
} else {
// Pin the capacity to the maximum int32_t value.
capacity = 0x7fffffff;
}
// Pin the capacity so that a limit pointer does not wrap around.
char *targetLimit = (char *)U_MAX_PTR(target);
// U_MAX_PTR(target) returns a targetLimit that is at most 0x7fffffff
// greater than target and does not wrap around the top of the address space.
capacity = (int32_t)(targetLimit - target);
}
// create the converter