organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-8464 Implement more changes from Markus' code review.

Browse source 
X-SVN-Rev: 34929
This commit is contained in:
Travis Keep 2014-01-17 23:11:22 +00:00
parent 4fb86a23e2
commit 281cbf5106
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
icu4c/source/common/lrucache.cpp
View file

@ -41,9 +41,7 @@ void LRUCache::CacheEntry::unlink() {
void LRUCache::CacheEntry::reset() {
SharedObject::clearPtr(cachedData);
status = U_ZERO_ERROR;
if (localeId != NULL) {
uprv_free(localeId);
}
uprv_free(localeId);
localeId = NULL;
}
@ -55,7 +53,7 @@ void LRUCache::CacheEntry::init(
status = err;
}
void LRUCache::moveToMostRecent(LRUCache::CacheEntry *entry) {
void LRUCache::moveToMostRecent(CacheEntry *entry) {
if (entry->moreRecent == mostRecentlyUsedMarker) {
return;
}
@ -66,7 +64,7 @@ void LRUCache::moveToMostRecent(LRUCache::CacheEntry *entry) {
mostRecentlyUsedMarker->lessRecent = entry;
}
void LRUCache::init(char *adoptedLocId, LRUCache::CacheEntry *entry) {
void LRUCache::init(char *adoptedLocId, CacheEntry *entry) {
UErrorCode status = U_ZERO_ERROR;
SharedObject *result = create(adoptedLocId, status);
entry->init(adoptedLocId, result, status);
@ -79,14 +77,17 @@ UBool LRUCache::contains(const char *localeId) const {
const SharedObject *LRUCache::_get(const char *localeId, UErrorCode &status) {
// TODO (Travis Keep): Consider stripping irrelevant locale keywords.
LRUCache::CacheEntry *entry = (LRUCache::CacheEntry *) uhash_get(
if (U_FAILURE(status)) {
return NULL;
}
CacheEntry *entry = (CacheEntry *) uhash_get(
localeIdToEntries, localeId);
if (entry == NULL) {
// Its a cache miss.
if (uhash_count(localeIdToEntries) < maxSize) {
// Cache not full. There is room for a new entry.
entry = new LRUCache::CacheEntry;
entry = new CacheEntry;
if (entry == NULL) {
status = U_MEMORY_ALLOCATION_ERROR;
return NULL;
@ -134,8 +135,8 @@ LRUCache::LRUCache(int32_t size, UErrorCode &status) :
if (U_FAILURE(status)) {
return;
}
mostRecentlyUsedMarker = new LRUCache::CacheEntry;
leastRecentlyUsedMarker = new LRUCache::CacheEntry;
mostRecentlyUsedMarker = new CacheEntry;
leastRecentlyUsedMarker = new CacheEntry;
if (mostRecentlyUsedMarker == NULL || leastRecentlyUsedMarker == NULL) {
delete mostRecentlyUsedMarker;
delete leastRecentlyUsedMarker;
@ -160,8 +161,8 @@ LRUCache::LRUCache(int32_t size, UErrorCode &status) :
LRUCache::~LRUCache() {
uhash_close(localeIdToEntries);
for (LRUCache::CacheEntry *i = mostRecentlyUsedMarker; i != NULL;) {
LRUCache::CacheEntry *next = i->lessRecent;
for (CacheEntry *i = mostRecentlyUsedMarker; i != NULL;) {
CacheEntry *next = i->lessRecent;
delete i;
i = next;
}

2
icu4c/source/common/lrucache.h
View file

@ -22,8 +22,6 @@ U_NAMESPACE_BEGIN
* LRUCache keyed by locale ID.
*/
class SharedObject;
class U_COMMON_API LRUCache : public UObject {
public:
template<typename T>

7
icu4c/source/i18n/reldatefmt.cpp
View file

@ -88,10 +88,11 @@ struct UnitPattern {
appendTo.append(pattern);
return appendTo;
}
appendTo.append(pattern.tempSubStringBetween(0, offset));
appendTo.append(pattern, 0, offset);
nf.format(quantity, appendTo);
appendTo.append(pattern.tempSubStringBetween(
offset + LENGTHOF(gPlaceholder)));
appendTo.append(pattern,
offset + LENGTHOF(gPlaceholder),
0x7fffffff);
return appendTo;
}
};