From 5391e72e091983d8ace1317cd66339a68427a8ce Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Tue, 22 Jan 2008 00:11:43 +0000
Subject: [PATCH] ICU-6153 Fix for Windows versus non-Windows differences.

X-SVN-Rev: 23285
---
 icu4c/source/i18n/choicfmt.cpp         | 33 ++++++++++++++------------
 icu4c/source/test/intltest/tchcfmt.cpp |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/icu4c/source/i18n/choicfmt.cpp b/icu4c/source/i18n/choicfmt.cpp
index 046ea44ecb4..ece4de01a7e 100644
--- a/icu4c/source/i18n/choicfmt.cpp
+++ b/icu4c/source/i18n/choicfmt.cpp
@@ -231,7 +231,6 @@ ChoiceFormat::dtos(double value,
     char temp[DBL_DIG + 16];
     char *itrPtr = temp;
     char *expPtr;
-    char *startPtr;
 
     sprintf(temp, "%.*g", DBL_DIG, value);
 
@@ -251,23 +250,27 @@ ChoiceFormat::dtos(double value,
     while (*itrPtr && *itrPtr != 'e') {
         itrPtr++;
     }
-    /* Verify the exponent sign */
-    if (*itrPtr == '+' || *itrPtr == '-') {
+    if (*itrPtr == 'e') {
         itrPtr++;
-    }
-    /* Remove leading zeros. You will see this on non-Windows machines. */
-    expPtr = itrPtr;
-    while (*itrPtr && *itrPtr == '0') {
-        itrPtr++;
-    }
-    if (*itrPtr && expPtr != itrPtr) {
-        /* Shift the exponent without zeros. */
-        while (*itrPtr) {
-            *(expPtr++)  = *(itrPtr++);
+        /* Verify the exponent sign */
+        if (*itrPtr == '+' || *itrPtr == '-') {
+            itrPtr++;
+        }
+        /* Remove leading zeros. You will see this on Windows machines. */
+        expPtr = itrPtr;
+        while (*itrPtr == '0') {
+            itrPtr++;
+        }
+        if (*itrPtr && expPtr != itrPtr) {
+            /* Shift the exponent without zeros. */
+            while (*itrPtr) {
+                *(expPtr++)  = *(itrPtr++);
+            }
+            // NULL terminate
+            *expPtr = 0;
         }
-        // NULL terminate
-        *itrPtr = 0;
     }
+
     string = UnicodeString(temp, -1, US_INV);    /* invariant codepage */
     return string;
 }
diff --git a/icu4c/source/test/intltest/tchcfmt.cpp b/icu4c/source/test/intltest/tchcfmt.cpp
index 9d986099268..61aafbaa78b 100644
--- a/icu4c/source/test/intltest/tchcfmt.cpp
+++ b/icu4c/source/test/intltest/tchcfmt.cpp
@@ -621,7 +621,7 @@ void TestChoiceFormat::TestChoiceFormatToPatternOverflow()
     static const double limits[] = {0.1e-78, 1e13, 0.1e78};
     UnicodeString monthNames[] = { "one", "two", "three" };
     ChoiceFormat fmt(limits, monthNames, sizeof(limits)/sizeof(limits[0]));
-    UnicodeString patStr, expectedPattern("1e-079#one|10000000000000#two|1e+077#three");
+    UnicodeString patStr, expectedPattern("1e-79#one|10000000000000#two|1e+77#three");
     fmt.toPattern(patStr);
     if (patStr != expectedPattern) {
         errln("ChoiceFormat returned \"" + patStr + "\" instead of \"" + expectedPattern + "\"");