ICU 56 update step 1

source/i18n/winnmfmt.cpp

 /*
 ********************************************************************************
-*   Copyright (C) 2005-2014, International Business Machines
+*   Copyright (C) 2005-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *
 * File WINNMFMT.CPP
 *
 ********************************************************************************
 */
 
 #include "unicode/utypes.h"
 
@@ skipping 115 matching lines @@
 static void freeCurrencyFormat(CURRENCYFMTW *fmt)
 {
     if (fmt != NULL) {
         DELETE_ARRAY(fmt->lpCurrencySymbol);
         DELETE_ARRAY(fmt->lpThousandSep);
         DELETE_ARRAY(fmt->lpDecimalSep);
     }
 }
 
 Win32NumberFormat::Win32NumberFormat(const Locale &locale, UBool currency, UErrorCode &status)
-  : NumberFormat(), fCurrency(currency), fFractionDigitsSet(FALSE), fFormatInfo(NULL)
+  : NumberFormat(), fCurrency(currency), fFormatInfo(NULL), fFractionDigitsSet(FALSE)
 {
     if (!U_FAILURE(status)) {
         fLCID = locale.getLCID();
 
         // Resolve actual locale to be used later
         UErrorCode tmpsts = U_ZERO_ERROR;
         char tmpLocID[ULOC_FULLNAME_CAPACITY];
         int32_t len = uloc_getLocaleForLCID(fLCID, tmpLocID, sizeof(tmpLocID)/sizeof(tmpLocID[0]) - 1, &tmpsts);
         if (U_SUCCESS(tmpsts)) {
             tmpLocID[len] = 0;
@@ skipping 52 matching lines @@
     return *this;
 }
 
 Format *Win32NumberFormat::clone(void) const
 {
     return new Win32NumberFormat(*this);
 }
 
 UnicodeString& Win32NumberFormat::format(double number, UnicodeString& appendTo, FieldPosition& pos) const
 {
-    return variadicFormat(getMaximumFractionDigits(), appendTo, L"%.16f", number);
+    return format(getMaximumFractionDigits(), appendTo, L"%.16f", number);
 }
 
 UnicodeString& Win32NumberFormat::format(int32_t number, UnicodeString& appendTo, FieldPosition& pos) const
 {
-    return variadicFormat(getMinimumFractionDigits(), appendTo, L"%I32d", number);
+    return format(getMinimumFractionDigits(), appendTo, L"%I32d", number);
 }
 
 UnicodeString& Win32NumberFormat::format(int64_t number, UnicodeString& appendTo, FieldPosition& pos) const
 {
-    return variadicFormat(getMinimumFractionDigits(), appendTo, L"%I64d", number);
+    return format(getMinimumFractionDigits(), appendTo, L"%I64d", number);
 }
 
 void Win32NumberFormat::parse(const UnicodeString& text, Formattable& result, ParsePosition& parsePosition) const
 {
     UErrorCode status = U_ZERO_ERROR;
     NumberFormat *nf = fCurrency? NumberFormat::createCurrencyInstance(fLocale, status) : NumberFormat::createInstance(fLocale, status);
 
     nf->parse(text, result, parsePosition);
     delete nf;
 }
 void Win32NumberFormat::setMaximumFractionDigits(int32_t newValue)
 {
     fFractionDigitsSet = TRUE;
     NumberFormat::setMaximumFractionDigits(newValue);
 }
 
 void Win32NumberFormat::setMinimumFractionDigits(int32_t newValue)
 {
     fFractionDigitsSet = TRUE;
     NumberFormat::setMinimumFractionDigits(newValue);
 }
 
-UnicodeString &Win32NumberFormat::variadicFormat(int32_t numDigits, UnicodeString &appendTo, const wchar_t *fmt, ...) const
+UnicodeString &Win32NumberFormat::format(int32_t numDigits, UnicodeString &appendTo, const wchar_t *fmt, ...) const
 {
     wchar_t nStackBuffer[STACK_BUFFER_SIZE];
     wchar_t *nBuffer = nStackBuffer;
     va_list args;
     int result;
 
     nBuffer[0] = 0x0000;
 
     /* Due to the arguments causing a result to be <= 23 characters (+2 for NULL and minus),
     we don't need to reallocate the buffer. */
@@ skipping 96 matching lines @@
     }*/
 
     return appendTo;
 }
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif // U_PLATFORM_USES_ONLY_WIN32_API