ICU-461.12.tar.gz

[apple/icu.git] / icuSources / io / locbund.c

diff --git a/icuSources/io/locbund.c b/icuSources/io/locbund.c
index 3d0f9cf5b2eafee6d2f9dd19c84bcf504a6f8bc8..1859999b158303343af36fd47d9c422f7654f548 100644 (file)
--- a/icuSources/io/locbund.c
+++ b/icuSources/io/locbund.c
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
 /*
 *******************************************************************************
 *

-*   Copyright (C) 1998-2004, International Business Machines
+*   Copyright (C) 1998-2007, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************


@@ -12,12 +12,10 @@
 *
 *   Date        Name        Description
 *   11/18/98    stephen        Creation.
 *
 *   Date        Name        Description
 *   11/18/98    stephen        Creation.

-*   12/10/1999  bobbyr@optiosoftware.com       Fix for memory leak + string allocation bugs
+*   12/10/1999  bobbyr(at)optiosoftware.com       Fix for memory leak + string allocation bugs

 *******************************************************************************
 */
 
 *******************************************************************************
 */
 

-#include <stdlib.h>
-

 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING


@@ -25,9 +23,52 @@
 #include "locbund.h"
 
 #include "cmemory.h"
 #include "locbund.h"
 
 #include "cmemory.h"

+#include "cstring.h"
+#include "ucln_io.h"
+#include "umutex.h"

 #include "unicode/ustring.h"
 #include "unicode/uloc.h"
 
 #include "unicode/ustring.h"
 #include "unicode/uloc.h"
 

+static UBool isFormatsInitialized = FALSE;
+static UNumberFormat *gPosixNumberFormat[ULOCALEBUNDLE_NUMBERFORMAT_COUNT];
+
+U_CDECL_BEGIN
+static UBool U_CALLCONV locbund_cleanup(void) {
+    int32_t style;
+    for (style = 0; style < ULOCALEBUNDLE_NUMBERFORMAT_COUNT; style++) {
+        unum_close(gPosixNumberFormat[style]);
+        gPosixNumberFormat[style] = NULL;
+    }
+    isFormatsInitialized = FALSE;
+    return TRUE;
+}
+U_CDECL_END
+
+
+static U_INLINE UNumberFormat * copyInvariantFormatter(ULocaleBundle *result, UNumberFormatStyle style) {
+    if (result->fNumberFormat[style-1] == NULL) {
+        UErrorCode status = U_ZERO_ERROR;
+        UBool needsInit;
+
+        UMTX_CHECK(NULL, gPosixNumberFormat[style-1] == NULL, needsInit);
+        if (needsInit) {
+            UNumberFormat *formatAlias = unum_open(style, NULL, 0, "en_US_POSIX", NULL, &status);
+
+            /* Cache upon first request. */
+            if (U_SUCCESS(status)) {
+                umtx_lock(NULL);
+                gPosixNumberFormat[style-1] = formatAlias;
+                ucln_io_registerCleanup(UCLN_IO_LOCBUND, locbund_cleanup);
+                umtx_unlock(NULL);
+            }
+        }
+
+        /* Copy the needed formatter. */
+        result->fNumberFormat[style-1] = unum_clone(gPosixNumberFormat[style-1], &status);
+    }
+    return result->fNumberFormat[style-1];
+}
+

 ULocaleBundle*        
 u_locbund_init(ULocaleBundle *result, const char *loc)
 {
 ULocaleBundle*        
 u_locbund_init(ULocaleBundle *result, const char *loc)
 {


@@ -39,7 +80,7 @@ u_locbund_init(ULocaleBundle *result, const char *loc)
     if (loc == NULL) {
         loc = uloc_getDefault();
     }
     if (loc == NULL) {
         loc = uloc_getDefault();
     }

-    
+

     uprv_memset(result, 0, sizeof(ULocaleBundle));
 
     len = (int32_t)strlen(loc);
     uprv_memset(result, 0, sizeof(ULocaleBundle));
 
     len = (int32_t)strlen(loc);


@@ -47,9 +88,11 @@ u_locbund_init(ULocaleBundle *result, const char *loc)
     if(result->fLocale == 0) {
         return 0;
     }
     if(result->fLocale == 0) {
         return 0;
     }

-    
-    strcpy(result->fLocale, loc);
-    
+
+    uprv_strcpy(result->fLocale, loc);
+
+    result->isInvariantLocale = uprv_strcmp(result->fLocale, "en_US_POSIX") == 0;
+

     return result;
 }
 
     return result;
 }
 


@@ -119,17 +162,22 @@ UNumberFormat*
 u_locbund_getNumberFormat(ULocaleBundle *bundle, UNumberFormatStyle style)
 {
     UNumberFormat *formatAlias = NULL;
 u_locbund_getNumberFormat(ULocaleBundle *bundle, UNumberFormatStyle style)
 {
     UNumberFormat *formatAlias = NULL;

-    if (style >= UNUM_IGNORE) {
+    if (style > UNUM_IGNORE) {

         formatAlias = bundle->fNumberFormat[style-1];
         if (formatAlias == NULL) {
         formatAlias = bundle->fNumberFormat[style-1];
         if (formatAlias == NULL) {

-            UErrorCode status = U_ZERO_ERROR;
-            formatAlias = unum_open(style, NULL, 0, bundle->fLocale, NULL, &status);
-            if (U_FAILURE(status)) {
-                unum_close(formatAlias);
-                formatAlias = NULL;
+            if (bundle->isInvariantLocale) {
+                formatAlias = copyInvariantFormatter(bundle, style);

             }
             else {
             }
             else {

-                bundle->fNumberFormat[style-1] = formatAlias;
+                UErrorCode status = U_ZERO_ERROR;
+                formatAlias = unum_open(style, NULL, 0, bundle->fLocale, NULL, &status);
+                if (U_FAILURE(status)) {
+                    unum_close(formatAlias);
+                    formatAlias = NULL;
+                }
+                else {
+                    bundle->fNumberFormat[style-1] = formatAlias;
+                }

             }
         }
     }
             }
         }
     }