From 2c1c85aee897a19edbd06f98aaf9291f72dc5850 Mon Sep 17 00:00:00 2001
From: Tom Zhang <tomzhang@svn.icu-project.org>
Date: Fri, 1 Aug 2014 21:33:16 +0000
Subject: [PATCH] ICU-10320 fix compiler warning & solaris error

X-SVN-Rev: 36119
---
 icu4c/source/i18n/smpdtfmt.cpp       |  6 +++++
 icu4c/source/test/cintltst/cdattst.c | 40 +++++++++++++++-------------
 icu4c/source/test/cintltst/cdattst.h |  2 +-
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/icu4c/source/i18n/smpdtfmt.cpp b/icu4c/source/i18n/smpdtfmt.cpp
index 8085dc12e36..0d5f90a4f82 100644
--- a/icu4c/source/i18n/smpdtfmt.cpp
+++ b/icu4c/source/i18n/smpdtfmt.cpp
@@ -1650,6 +1650,9 @@ SimpleDateFormat::subFormat(UnicodeString &appendTo,
 
 void SimpleDateFormat::adoptNumberFormat(NumberFormat *formatToAdopt) {
     formatToAdopt->setParseIntegerOnly(TRUE);
+    if (fNumberFormat && fNumberFormat != formatToAdopt){
+        delete fNumberFormat;
+    }
     fNumberFormat = formatToAdopt;
 
     if (fNumberFormatters) {
@@ -1668,6 +1671,9 @@ void SimpleDateFormat::adoptNumberFormat(NumberFormat *formatToAdopt) {
         if (cur->nf != formatToAdopt) { // only delete those not duplicate
             delete cur->nf;
             uprv_free(cur);
+        } else {
+            cur->nf = NULL;
+            uprv_free(cur);
         }
     }
 }
diff --git a/icu4c/source/test/cintltst/cdattst.c b/icu4c/source/test/cintltst/cdattst.c
index a4deee23502..a518d7c1909 100644
--- a/icu4c/source/test/cintltst/cdattst.c
+++ b/icu4c/source/test/cintltst/cdattst.c
@@ -55,7 +55,7 @@ void addDateForTest(TestNode** root)
     TESTCASE(TestRelativeCrash);
     TESTCASE(TestContext);
     TESTCASE(TestCalendarDateParse);
-    TESTCASE(TestOverrideNumberForamt);
+    TESTCASE(TestOverrideNumberFormat);
 }
 /* Testing the DateFormat API */
 static void TestDateFormat()
@@ -1555,7 +1555,7 @@ static const char * overrideNumberFormat[][2] = {
         {"mixed", "\\u521D\\u4E03 \\u521D\\u4E8C"}
 };
 
-static void TestOverrideNumberForamt(void) {
+static void TestOverrideNumberFormat(void) {
     UErrorCode status = U_ZERO_ERROR;
     UChar pattern[50];
     UChar* expected;
@@ -1566,8 +1566,8 @@ static void TestOverrideNumberForamt(void) {
     UDateFormat* fmt;
     UNumberFormat* overrideFmt;
     const UNumberFormat* getter_result;
-    UDate july022008 = 1215000000000.0;
     int32_t i;
+    unsigned j;
 
     expected=(UChar*)malloc(sizeof(UChar) * 10);
     fields=(UChar*)malloc(sizeof(UChar) * 10);
@@ -1592,23 +1592,23 @@ static void TestOverrideNumberForamt(void) {
     udat_setNumberFormat(fmt, overrideFmt); // test the same override NF will not crash
     udat_close(fmt);
     
-    for (i=0; i<sizeof(overrideNumberFormat)/sizeof(overrideNumberFormat[0]); i++){
+    for (j=0; i<sizeof(overrideNumberFormat)/sizeof(overrideNumberFormat[0]); i++){
         UChar ubuf[kUbufMax];
-        UDateFormat* fmt;
-        UNumberFormat* overrideFmt;
+        UDateFormat* fmt2;
+        UNumberFormat* overrideFmt2;
 
-        fmt =udat_open(UDAT_PATTERN, UDAT_PATTERN,"en_US",NULL,0,pattern, u_strlen(pattern), &status);
+        fmt2 =udat_open(UDAT_PATTERN, UDAT_PATTERN,"en_US",NULL,0,pattern, u_strlen(pattern), &status);
         assertSuccess("udat_open() with en_US", &status);
 
-        overrideFmt = unum_open(UNUM_DEFAULT, NULL, 0, localeString, NULL, &status);
+        overrideFmt2 = unum_open(UNUM_DEFAULT, NULL, 0, localeString, NULL, &status);
         assertSuccess("unum_open() in loop", &status);
 
         u_uastrcpy(fields, overrideNumberFormat[i][0]);
         u_unescape(overrideNumberFormat[i][1], expected, 50);
 
-        if (overrideNumberFormat[i][0] == "") { // use the one w/o field
-            udat_setNumberFormat(fmt, overrideFmt);
-        } else if (overrideNumberFormat[i][0] == "mixed") { // set 1 field at first but then full override, both(M & d) should be override
+        if ( strcmp(overrideNumberFormat[i][0], "") == 0 ) { // use the one w/o field
+            udat_setNumberFormat(fmt2, overrideFmt2);
+        } else if ( strcmp(overrideNumberFormat[i][0], "mixed") == 0 ) { // set 1 field at first but then full override, both(M & d) should be override
             const char* singleLocale = "en@numbers=hebr";
             UNumberFormat* singleOverrideFmt;
             u_uastrcpy(fields, "d");
@@ -1616,29 +1616,33 @@ static void TestOverrideNumberForamt(void) {
             singleOverrideFmt = unum_open(UNUM_DEFAULT, NULL, 0, singleLocale, NULL, &status);
             assertSuccess("unum_open() in mixed", &status);
 
-            udat_adoptNumberFormatForFields(fmt, fields, singleOverrideFmt, &status);
+            udat_adoptNumberFormatForFields(fmt2, fields, singleOverrideFmt, &status);
             assertSuccess("udat_setNumberFormatForField() in mixed", &status);
 
-            udat_setNumberFormat(fmt, overrideFmt);
-        } else if (overrideNumberFormat[i][0] == "do") { // o is an invalid field
-            udat_adoptNumberFormatForFields(fmt, fields, overrideFmt, &status);
+            udat_setNumberFormat(fmt2, overrideFmt2);
+        } else if ( strcmp(overrideNumberFormat[i][0], "do") == 0 ) { // o is an invalid field
+            udat_adoptNumberFormatForFields(fmt2, fields, overrideFmt2, &status);
             if(status == U_INVALID_FORMAT_ERROR) {
+                udat_close(fmt2);
                 status = U_ZERO_ERROR;
                 continue;
             }
         } else {
-            udat_adoptNumberFormatForFields(fmt, fields, overrideFmt, &status);
+            udat_adoptNumberFormatForFields(fmt2, fields, overrideFmt2, &status);
             assertSuccess("udat_setNumberFormatForField() in loop", &status);
         }
 
-        udat_format(fmt, july022008, ubuf, kUbufMax, NULL, &status);
+        udat_format(fmt2, july022008, ubuf, kUbufMax, NULL, &status);
         assertSuccess("udat_format() july022008", &status);
 
         if (u_strncmp(ubuf, expected, kUbufMax) != 0) 
             log_err("fail: udat_format for locale, expected %s, got %s\n",
                     u_austrncpy(bbuf1,expected,kUbufMax), u_austrncpy(bbuf2,ubuf,kUbufMax) );
 
-        udat_close(fmt);
+        udat_close(fmt2);
+        if ( strcmp(overrideNumberFormat[i][0], "") == 0 ) { // set uses clone, so free up
+            udat_close(overrideFmt2);
+        }
     }
     free(expected);
     free(fields);
diff --git a/icu4c/source/test/cintltst/cdattst.h b/icu4c/source/test/cintltst/cdattst.h
index 32a41b7655e..f27bdddfa46 100644
--- a/icu4c/source/test/cintltst/cdattst.h
+++ b/icu4c/source/test/cintltst/cdattst.h
@@ -54,7 +54,7 @@
     /**
      * Test DateFormat override number format API
      */
-     static void TestOverrideNumberForamt(void);
+     static void TestOverrideNumberFormat(void);
 
 
 #endif /* #if !UCONFIG_NO_FORMATTING */