ICU 56 update step 1

source/common/locmap.c

 /*
  **********************************************************************
- *   Copyright (C) 1996-2013, International Business Machines
+ *   Copyright (C) 1996-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  *
  * Provides functionality for mapping between
  * LCID and Posix IDs or ICU locale to codepage
  *
  * Note: All classes and code in this file are
  *       intended for internal use only.
  *
  * Methods of interest:
  *   unsigned long convertToLCID(const char*);
  *   const char* convertToPosix(unsigned long);
  *
  * Kathleen Wilson, 4/30/96
  *
  *  Date        Name        Description
  *  3/11/97     aliu        Fixed off-by-one bug in assignment operator. Added
  *                          setId() method and safety check against 
  *                          MAX_ID_LENGTH.
  * 04/23/99     stephen     Added C wrapper for convertToPosix.
  * 09/18/00     george      Removed the memory leaks.
  * 08/23/01     george      Convert to C
  */
 
 #include "locmap.h"
 #include "cstring.h"
 #include "cmemory.h"
 
-#if 0
 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500)
 /*
  * TODO: It seems like we should widen this to
  * either U_PLATFORM_USES_ONLY_WIN32_API (includes MinGW)
  * or U_PLATFORM_HAS_WIN32_API (includes MinGW and Cygwin)
  * but those use gcc and won't have defined(_MSC_VER).
  * We might need to #include some Windows header and test for some version macro from there.
  * Or call some Windows function and see what it returns.
  */
 #define USE_WINDOWS_LOCALE_API
 #endif
-#endif
 
 #ifdef USE_WINDOWS_LOCALE_API
 #include <windows.h>
 #include <winnls.h>
 #endif
 
 /*
  * Note:
  * The mapping from Win32 locale ID numbers to POSIX locale strings should
  * be the faster one.
@@ skipping 340 matching lines @@
     {0x081a, "sr_Latn_CS"}, /* Serbo-Croatian*/
     {0x701a, "sr_Latn"},    /* It's 0x1a or 0x081a, pick one to make the test program happy. */
     {0x1c1a, "sr_Cyrl_BA"}, /* Serbo-Croatian in Bosnia */
     {0x0c1a, "sr_Cyrl_CS"}, /* Serbian*/
     {0x301a, "sr_Cyrl_ME"},
     {0x281a, "sr_Cyrl_RS"},
     {0x6c1a, "sr_Cyrl"},    /* It's 0x1a or 0x0c1a, pick one to make the test program happy. */
     {0x7c1a, "sr"}          /* In CLDR sr is sr_Cyrl. */
 };
 
+ILCID_POSIX_SUBTABLE(hsb) {
+    {0x2E,   "hsb"},
+    {0x042E, "hsb_DE"},
+    {0x082E, "dsb_DE"},
+    {0x7C2E, "dsb"},
+};
+
 ILCID_POSIX_ELEMENT_ARRAY(0x040e, hu, hu_HU)
 ILCID_POSIX_ELEMENT_ARRAY(0x042b, hy, hy_AM)
 ILCID_POSIX_ELEMENT_ARRAY(0x0469, ibb, ibb_NG)
 ILCID_POSIX_ELEMENT_ARRAY(0x0421, id, id_ID)
 ILCID_POSIX_ELEMENT_ARRAY(0x0470, ig, ig_NG)
 ILCID_POSIX_ELEMENT_ARRAY(0x0478, ii, ii_CN)
 ILCID_POSIX_ELEMENT_ARRAY(0x040f, is, is_IS)
 
 ILCID_POSIX_SUBTABLE(it) {
     {0x10,   "it"},
@@ skipping 266 matching lines @@
     {0x7c43, "uz_Latn"} /* Latin based */
 };
 
 ILCID_POSIX_SUBTABLE(ve) { /* TODO: Verify the country */
     {0x33,   "ve"},
     {0x0433, "ve_ZA"},
     {0x0433, "ven_ZA"}
 };
 
 ILCID_POSIX_ELEMENT_ARRAY(0x042a, vi, vi_VN)
-
-ILCID_POSIX_SUBTABLE(wen) {
-    {0x2E,   "wen"},
-    {0x042E, "wen_DE"},
-    {0x042E, "hsb_DE"},
-    {0x082E, "dsb_DE"},
-    {0x7C2E, "dsb"},
-    {0x2E,   "hsb"}
-};
-
 ILCID_POSIX_ELEMENT_ARRAY(0x0488, wo, wo_SN)
 ILCID_POSIX_ELEMENT_ARRAY(0x0434, xh, xh_ZA)
 ILCID_POSIX_ELEMENT_ARRAY(0x043d, yi, yi)
 ILCID_POSIX_ELEMENT_ARRAY(0x046a, yo, yo_NG)
 
 ILCID_POSIX_SUBTABLE(zh) {
     {0x0004, "zh_Hans"},
     {0x7804, "zh"},
     {0x0804, "zh_CN"},
     {0x0804, "zh_Hans_CN"},
@@ skipping 63 matching lines @@
     ILCID_POSIX_MAP(gd),    /*  gd  Gaelic (United Kingdom)   0x91 */
     ILCID_POSIX_MAP(gl),    /*  gl  Galician                  0x56 */
     ILCID_POSIX_MAP(gn),    /*  gn  Guarani                   0x74 */
     ILCID_POSIX_MAP(gsw),   /*  gsw Alemanic/Alsatian/Swiss German 0x84 */
     ILCID_POSIX_MAP(gu),    /*  gu  Gujarati                  0x47 */
     ILCID_POSIX_MAP(ha),    /*  ha  Hausa                     0x68 */
     ILCID_POSIX_MAP(haw),   /*  haw Hawaiian                  0x75 */
     ILCID_POSIX_MAP(he),    /*  he  Hebrew (formerly iw)      0x0d */
     ILCID_POSIX_MAP(hi),    /*  hi  Hindi                     0x39 */
     ILCID_POSIX_MAP(hr),    /*  *   Croatian and others       0x1a */
+    ILCID_POSIX_MAP(hsb),   /*  hsb Upper Sorbian             0x2e */
     ILCID_POSIX_MAP(hu),    /*  hu  Hungarian                 0x0e */
     ILCID_POSIX_MAP(hy),    /*  hy  Armenian                  0x2b */
     ILCID_POSIX_MAP(ibb),   /*  ibb Ibibio - Nigeria          0x69 */
     ILCID_POSIX_MAP(id),    /*  id  Indonesian (formerly in)  0x21 */
     ILCID_POSIX_MAP(ig),    /*  ig  Igbo                      0x70 */
     ILCID_POSIX_MAP(ii),    /*  ii  Sichuan Yi                0x78 */
     ILCID_POSIX_MAP(is),    /*  is  Icelandic                 0x0f */
     ILCID_POSIX_MAP(it),    /*  it  Italian                   0x10 */
     ILCID_POSIX_MAP(iu),    /*  iu  Inuktitut                 0x5d */
     ILCID_POSIX_MAP(iw),    /*  iw  Hebrew                    0x0d */
@@ skipping 69 matching lines @@
     ILCID_POSIX_MAP(tr),    /*  tr  Turkish                   0x1f */
     ILCID_POSIX_MAP(ts),    /*  ts  Tsonga                    0x31 */
     ILCID_POSIX_MAP(tt),    /*  tt  Tatar                     0x44 */
     ILCID_POSIX_MAP(tzm),   /*  tzm Tamazight                 0x5f */
     ILCID_POSIX_MAP(ug),    /*  ug  Uighur                    0x80 */
     ILCID_POSIX_MAP(uk),    /*  uk  Ukrainian                 0x22 */
     ILCID_POSIX_MAP(ur),    /*  ur  Urdu                      0x20 */
     ILCID_POSIX_MAP(uz),    /*  uz  Uzbek                     0x43 */
     ILCID_POSIX_MAP(ve),    /*  ve  Venda                     0x33 */
     ILCID_POSIX_MAP(vi),    /*  vi  Vietnamese                0x2a */
-    ILCID_POSIX_MAP(wen),   /*  wen Sorbian                   0x2e */
     ILCID_POSIX_MAP(wo),    /*  wo  Wolof                     0x88 */
     ILCID_POSIX_MAP(xh),    /*  xh  Xhosa                     0x34 */
     ILCID_POSIX_MAP(yi),    /*  yi  Yiddish                   0x3d */
     ILCID_POSIX_MAP(yo),    /*  yo  Yoruba                    0x6a */
     ILCID_POSIX_MAP(zh),    /*  zh  Chinese                   0x04 */
     ILCID_POSIX_MAP(zu),    /*  zu  Zulu                      0x35 */
 };
 
 static const uint32_t gLocaleCount = sizeof(gPosixIDmap)/sizeof(ILcidPosixMap);
 
@@ skipping 247 matching lines @@
     if (fallbackValue != (uint32_t)-1) {
         *status = U_USING_FALLBACK_WARNING;
         return fallbackValue;
     }
 
     /* no match found */
     *status = U_ILLEGAL_ARGUMENT_ERROR;
     return 0;   /* return international (root) */
 }