ICU-66108.tar.gz

[apple/icu.git] / icuSources / i18n / udat.cpp

diff --git a/icuSources/i18n/udat.cpp b/icuSources/i18n/udat.cpp
index 5e83751ea1e6d63e0481fe1c1304428cc63ee491..f6a04b053debbfd614e47fe945dc6b70d018e7ab 100644 (file)
--- a/icuSources/i18n/udat.cpp
+++ b/icuSources/i18n/udat.cpp
@@ -83,13 +83,24 @@ static UCalendarDateFields gDateFieldMapping[] = {
     UCAL_ZONE_OFFSET,          // UDAT_TIMEZONE_ISO_FIELD = 32 (also UCAL_DST_OFFSET)
     UCAL_ZONE_OFFSET,          // UDAT_TIMEZONE_ISO_LOCAL_FIELD = 33 (also UCAL_DST_OFFSET)
     UCAL_EXTENDED_YEAR,        // UDAT_RELATED_YEAR_FIELD = 34 (not an exact match)
     UCAL_ZONE_OFFSET,          // UDAT_TIMEZONE_ISO_FIELD = 32 (also UCAL_DST_OFFSET)
     UCAL_ZONE_OFFSET,          // UDAT_TIMEZONE_ISO_LOCAL_FIELD = 33 (also UCAL_DST_OFFSET)
     UCAL_EXTENDED_YEAR,        // UDAT_RELATED_YEAR_FIELD = 34 (not an exact match)

-    UCAL_FIELD_COUNT,          // UDAT_FIELD_COUNT = 35
+    UCAL_FIELD_COUNT,          // UDAT_AM_PM_MIDNIGHT_NOON_FIELD=35 (no match)
+    UCAL_FIELD_COUNT,          // UDAT_FLEXIBLE_DAY_PERIOD_FIELD=36 (no match)
+    UCAL_FIELD_COUNT,          // UDAT_TIME_SEPARATOR_FIELD = 37 (no match)
+                               // UDAT_FIELD_COUNT = 38 as of ICU 66

     // UCAL_IS_LEAP_MONTH is not the target of a mapping
 };
 
 U_CAPI UCalendarDateFields U_EXPORT2
 udat_toCalendarDateField(UDateFormatField field) {
     // UCAL_IS_LEAP_MONTH is not the target of a mapping
 };
 
 U_CAPI UCalendarDateFields U_EXPORT2
 udat_toCalendarDateField(UDateFormatField field) {

-  return gDateFieldMapping[field];
+  return (field >= UDAT_ERA_FIELD && field < UDAT_FIELD_COUNT)? gDateFieldMapping[field]: UCAL_FIELD_COUNT;
+}
+
+// for Apple <rdar://problem/62136559>
+U_CAPI UDateFormatField U_EXPORT2
+udat_patternCharToDateFormatField(UChar patternChar) {
+    const UChar* patternUChars = (UChar*)DateFormatSymbols::getPatternUChars();
+    UChar* patternOffset = u_strchr(patternUChars, patternChar);
+    return (patternOffset)? (UDateFormatField)(patternOffset-patternUChars): UDAT_FIELD_COUNT;

 }
 
 /* For now- one opener. */
 }
 
 /* For now- one opener. */


@@ -168,9 +179,13 @@ udat_open(UDateFormatStyle  timeStyle,
         }
     }
 
         }
     }
 

-    if(fmt == 0) {
+    if(fmt == nullptr) {

         *status = U_MEMORY_ALLOCATION_ERROR;
         *status = U_MEMORY_ALLOCATION_ERROR;

-        return 0;
+        return nullptr;
+    }
+    if (U_FAILURE(*status)) {
+        delete fmt;
+        return nullptr;

     }
 
     if(tzID != 0) {
     }
 
     if(tzID != 0) {


@@ -652,7 +667,7 @@ udat_getSymbols(const   UDateFormat     *fmt,
     } else {
         return -1;
     }
     } else {
         return -1;
     }

-    int32_t count;
+    int32_t count = 0;

     const UnicodeString *res = NULL;
 
     switch(type) {
     const UnicodeString *res = NULL;
 
     switch(type) {