ICU 56 update step 1

source/i18n/tznames.cpp

 /*
 *******************************************************************************
-* Copyright (C) 2011-2014, International Business Machines Corporation and    *
+* Copyright (C) 2011-2015, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/locid.h"
 #include "unicode/tznames.h"
@@ skipping 60 matching lines @@
     uprv_free(entry);
 }
 U_CDECL_END
 
 /**
  * Function used for removing unreferrenced cache entries exceeding
  * the expiration time. This function must be called with in the mutex
  * block.
  */
 static void sweepCache() {
-    int32_t pos = -1;
+    int32_t pos = UHASH_FIRST;
     const UHashElement* elem;
     double now = (double)uprv_getUTCtime();
 
     while ((elem = uhash_nextElement(gTimeZoneNamesCache, &pos))) {
         TimeZoneNamesCacheEntry *entry = (TimeZoneNamesCacheEntry *)elem->value.pointer;
         if (entry->refCount <= 0 && (now - entry->lastAccess) > CACHE_EXPIRATION) {
             // delete this entry
             uhash_removeElement(gTimeZoneNamesCache, elem);
         }
     }
@@ skipping 199 matching lines @@
     TimeZoneNames *instance = NULL;
     if (U_SUCCESS(status)) {
         instance = new TimeZoneNamesDelegate(locale, status);
         if (instance == NULL && U_SUCCESS(status)) {
             status = U_MEMORY_ALLOCATION_ERROR;
         }
     }
     return instance;
 }
 
-#ifndef U_HIDE_DRAFT_API
 TimeZoneNames*
 TimeZoneNames::createTZDBInstance(const Locale& locale, UErrorCode& status) {
     TimeZoneNames *instance = NULL;
     if (U_SUCCESS(status)) {
         instance = new TZDBTimeZoneNames(locale);
         if (instance == NULL && U_SUCCESS(status)) {
             status = U_MEMORY_ALLOCATION_ERROR;
         }
     }
     return instance;
 }
-#endif /* U_HIDE_DRAFT_API */
 
 UnicodeString&
 TimeZoneNames::getExemplarLocationName(const UnicodeString& tzID, UnicodeString& name) const {
     return TimeZoneNamesImpl::getDefaultExemplarLocationName(tzID, name);
 }
 
 UnicodeString&
 TimeZoneNames::getDisplayName(const UnicodeString& tzID, UTimeZoneNameType type, UDate date, UnicodeString& name) const {
     getTimeZoneDisplayName(tzID, type, name);
     if (name.isEmpty()) {
-        UnicodeString mzID;
+        UChar mzIDBuf[32];
+        UnicodeString mzID(mzIDBuf, 0, UPRV_LENGTHOF(mzIDBuf));
         getMetaZoneID(tzID, date, mzID);
         getMetaZoneDisplayName(mzID, type, name);
     }
     return name;
 }
 
 
 struct MatchInfo : UMemory {
     UTimeZoneNameType nameType;
     UnicodeString id;
@@ skipping 129 matching lines @@
     } else if (U_FAILURE(status)) {
         delete fMatches;
         fMatches = NULL;
     }
     return fMatches;
 }
 
 
 U_NAMESPACE_END
 #endif