Update ICU to 54.1 step 1

source/io/uprintf.cpp

 /*
 ******************************************************************************
 *
-*   Copyright (C) 1998-2012, International Business Machines
+*   Copyright (C) 1998-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *
-* File uprintf.c
+* File uprintf.cpp
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   11/19/98    stephen     Creation.
 *   03/12/99    stephen     Modified for new C API.
 *                           Added conversion from default codepage.
 *   08/07/2003  george      Reunify printf implementations
 ******************************************************************************
 */
 
 #include "unicode/utypes.h"
 
-#if !UCONFIG_NO_FORMATTING
+#if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION
 
 #include "unicode/ustdio.h"
 #include "unicode/ustring.h"
 #include "unicode/unum.h"
 #include "unicode/udat.h"
 #include "unicode/putil.h"
 
+#include "cmemory.h"
+#include "locbund.h"
+#include "mutex.h"
+#include "uassert.h"
 #include "uprintf.h"
 #include "ufile.h"
 #include "ucln_io.h"
-#include "locbund.h"
 
-#include "cmemory.h"
+U_NAMESPACE_USE
 
 static UFILE *gStdOut = NULL;
+static UInitOnce gStdOutInitOnce = U_INITONCE_INITIALIZER;
 
 static UBool U_CALLCONV uprintf_cleanup(void)
 {
     if (gStdOut != NULL) {
         u_fclose(gStdOut);
         gStdOut = NULL;
     }
+    gStdOutInitOnce.reset();
     return TRUE;
 }
 
+static void U_CALLCONV u_stdout_init() {
+    U_ASSERT(gStdOut ==  NULL);
+    gStdOut = u_finit(stdout, NULL, NULL);
+    ucln_io_registerCleanup(UCLN_IO_PRINTF, &uprintf_cleanup);
+}
+
 U_CAPI UFILE * U_EXPORT2
 u_get_stdout()
 {
-    if (gStdOut == NULL) {
-        gStdOut = u_finit(stdout, NULL, NULL);
-        ucln_io_registerCleanup(UCLN_IO_PRINTF, &uprintf_cleanup);
-    }
+    umtx_initOnce(gStdOutInitOnce, &u_stdout_init);
     return gStdOut;
 }
 
 static int32_t U_EXPORT2
 u_printf_write(void          *context,
                const UChar   *str,
                int32_t       count)
 {
     return u_file_write(str, count, (UFILE *)context);
 }
@@ skipping 88 matching lines @@
 }
 
 U_CAPI int32_t  U_EXPORT2 /* U_CAPI ... U_EXPORT2 added by Peter Kirk 17 Nov 2001 */
 u_vfprintf(    UFILE        *f,
            const char    *patternSpecification,
            va_list        ap)
 {
     int32_t count;
     UChar *pattern;
     UChar buffer[UFMT_DEFAULT_BUFFER_SIZE];
-    int32_t size = (int32_t)strlen(patternSpecification) + 1;
+    size_t size = strlen(patternSpecification) + 1;
 
     /* convert from the default codepage to Unicode */
     if (size >= MAX_UCHAR_BUFFER_SIZE(buffer)) {
         pattern = (UChar *)uprv_malloc(size * sizeof(UChar));
         if(pattern == 0) {
             return 0;
         }
     }
     else {
         pattern = buffer;
@@ skipping 25 matching lines @@
 
     /* parse and print the whole format string */
     u_printf_parse(&g_stream_handler, patternSpecification, f, NULL, &f->str.fBundle, &written, ap);
 
     /* return # of UChars written */
     return written;
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */