From ae61a779f57704080f11d7437a9129f40522ea0e Mon Sep 17 00:00:00 2001
From: Shane Carr <shane@unicode.org>
Date: Sat, 18 Jun 2016 01:37:37 +0000
Subject: [PATCH] ICU-12576 Fixing test failures under --disable-release mode.

X-SVN-Rev: 38864
---
 icu4c/source/i18n/dtptngen.cpp       | 15 ++++++++-------
 icu4c/source/i18n/unicode/dtptngen.h |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/icu4c/source/i18n/dtptngen.cpp b/icu4c/source/i18n/dtptngen.cpp
index c2689deb829..6196803b72c 100644
--- a/icu4c/source/i18n/dtptngen.cpp
+++ b/icu4c/source/i18n/dtptngen.cpp
@@ -678,10 +678,9 @@ DateTimePatternGenerator::hackTimes(const UnicodeString& hackPattern, UErrorCode
 
 static const UChar hourFormatChars[] = { CAP_H, LOW_H, CAP_K, LOW_K, 0 }; // HhKk, the hour format characters
 
-const char*
-DateTimePatternGenerator::getCalendarTypeToUse(const Locale& locale, UErrorCode& err) {
-    const char* calendarTypeToUse = DT_DateTimeGregorianTag; // initial default
-    char calendarType[ULOC_KEYWORDS_CAPACITY]; // to be filled in with the type to use, if all goes well
+void
+DateTimePatternGenerator::getCalendarTypeToUse(const Locale& locale, CharString& destination, UErrorCode& err) {
+    destination.clear().append(DT_DateTimeGregorianTag, -1, err); // initial default
     if ( U_SUCCESS(err) ) {
         char localeWithCalendarKey[ULOC_LOCALE_IDENTIFIER_CAPACITY];
         // obtain a locale that always has the calendar key value that should be used
@@ -697,6 +696,7 @@ DateTimePatternGenerator::getCalendarTypeToUse(const Locale& locale, UErrorCode&
             &err);
         localeWithCalendarKey[ULOC_LOCALE_IDENTIFIER_CAPACITY-1] = 0; // ensure null termination
         // now get the calendar key value from that locale
+        char calendarType[ULOC_KEYWORDS_CAPACITY];
         int32_t calendarTypeLen = uloc_getKeywordValue(
             localeWithCalendarKey,
             "calendar",
@@ -704,11 +704,11 @@ DateTimePatternGenerator::getCalendarTypeToUse(const Locale& locale, UErrorCode&
             ULOC_KEYWORDS_CAPACITY,
             &err);
         if (U_SUCCESS(err) && calendarTypeLen < ULOC_KEYWORDS_CAPACITY) {
-            calendarTypeToUse = calendarType;
+            destination.clear().append(calendarType, -1, err);
+            if (U_FAILURE(err)) { return; }
         }
         err = U_ZERO_ERROR;
     }
-    return calendarTypeToUse;
 }
 
 void
@@ -858,7 +858,8 @@ DateTimePatternGenerator::addCLDRData(const Locale& locale, UErrorCode& errorCod
     LocalUResourceBundlePointer rb(ures_open(NULL, locale.getName(), &errorCode));
     if (U_FAILURE(errorCode)) { return; }
 
-    const char* calendarTypeToUse = getCalendarTypeToUse(locale, errorCode);
+    CharString calendarTypeToUse; // to be filled in with the type to use, if all goes well
+    getCalendarTypeToUse(locale, calendarTypeToUse, errorCode);
     if (U_FAILURE(errorCode)) { return; }
 
     // Local err to ignore resource not found exceptions
diff --git a/icu4c/source/i18n/unicode/dtptngen.h b/icu4c/source/i18n/unicode/dtptngen.h
index 14d17419ae0..ab1d7b9d88c 100644
--- a/icu4c/source/i18n/unicode/dtptngen.h
+++ b/icu4c/source/i18n/unicode/dtptngen.h
@@ -538,7 +538,7 @@ private:
     void addCanonicalItems(UErrorCode &status);
     void addICUPatterns(const Locale& locale, UErrorCode& status);
     void hackTimes(const UnicodeString& hackPattern, UErrorCode& status);
-    const char* getCalendarTypeToUse(const Locale& locale, UErrorCode& status);
+    void getCalendarTypeToUse(const Locale& locale, CharString& destination, UErrorCode& err);
     void consumeShortTimePattern(const UnicodeString& shortTimePattern, UErrorCode& status);
     void addCLDRData(const Locale& locale, UErrorCode& status);
     UDateTimePatternConflict addPatternWithSkeleton(const UnicodeString& pattern, const UnicodeString * skeletonToUse, UBool override, UnicodeString& conflictingPattern, UErrorCode& status);
-- 
2.40.0