ICU-57131.0.1.tar.gz

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

diff --git a/icuSources/i18n/japancal.cpp b/icuSources/i18n/japancal.cpp
index 26ddcc3338a7db42dc1bab3e02a3627dc9c489d5..83aa038574e2563d42ba1cb735cff85df73d2b62 100644 (file)
--- a/icuSources/i18n/japancal.cpp
+++ b/icuSources/i18n/japancal.cpp
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
-* Copyright (C) 2003-2008, International Business Machines Corporation and    *
-* others. All Rights Reserved.                                                *
+* Copyright (C) 2003-2009,2012,2016 International Business Machines Corporation and
+* others. All Rights Reserved.
 *******************************************************************************
 *
 * File JAPANCAL.CPP
@@ -15,6 +15,7 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#include "cmemory.h"
 #include "japancal.h"
 #include "unicode/gregocal.h"
 #include "umutex.h"
@@ -276,9 +277,12 @@ static const struct {
     {  1989,    1,  8 }   // Heisei    235
 };
 
-#define kEraCount (sizeof(kEraInfo)/sizeof(kEraInfo[0]))
+#define kEraCount UPRV_LENGTHOF(kEraInfo)
 
-static const uint32_t kCurrentEra = (kEraCount-1);
+/**
+ * The current era, for reference. 
+ */
+static const int32_t kCurrentEra = (kEraCount-1);  // int32_t to match the calendar field type
 
 static const int32_t kGregorianEpoch = 1970;    // used as the default value of EXTENDED_YEAR
 
@@ -318,19 +322,16 @@ const char *JapaneseCalendar::getType() const
     return "japanese";
 }
 
-int32_t JapaneseCalendar::getDefaultMonthInYear() 
+int32_t JapaneseCalendar::getDefaultMonthInYear(int32_t eyear) 
 {
-    UErrorCode status  = U_ZERO_ERROR;
     int32_t era = internalGetEra();
-    computeFields(status); // slow
-    int32_t year = getGregorianYear();
     // TODO do we assume we can trust 'era'?  What if it is denormalized?
 
-    int32_t month = GregorianCalendar::getDefaultMonthInYear();
+    int32_t month = 0;
 
     // Find out if we are at the edge of an era
 
-    if(year == kEraInfo[era].year) {
+    if(eyear == kEraInfo[era].year) {
         // Yes, we're in the first year of this era.
         return kEraInfo[era].month-1;
     }
@@ -338,15 +339,12 @@ int32_t JapaneseCalendar::getDefaultMonthInYear()
     return month;
 }
 
-int32_t JapaneseCalendar::getDefaultDayInMonth(int32_t month) 
+int32_t JapaneseCalendar::getDefaultDayInMonth(int32_t eyear, int32_t month) 
 {
-    UErrorCode status  = U_ZERO_ERROR;
     int32_t era = internalGetEra();
-    computeFields(status); // slow
-    int32_t year = getGregorianYear();
-    int32_t day = GregorianCalendar::getDefaultDayInMonth(month);
+    int32_t day = 1;
 
-    if(year == kEraInfo[era].year) {
+    if(eyear == kEraInfo[era].year) {
         if(month == (kEraInfo[era].month-1)) {
             return kEraInfo[era].day;
         }
@@ -481,7 +479,7 @@ int32_t JapaneseCalendar::handleGetLimit(UCalendarDateFields field, ELimitType l
     switch(field) {
     case UCAL_ERA:
         if (limitType == UCAL_LIMIT_MINIMUM || limitType == UCAL_LIMIT_GREATEST_MINIMUM) {
-            return 1;
+            return 0;
         }
         return kCurrentEra;
     case UCAL_YEAR:
@@ -495,6 +493,8 @@ int32_t JapaneseCalendar::handleGetLimit(UCalendarDateFields field, ELimitType l
             case  UCAL_LIMIT_COUNT: //added to avoid warning
             case UCAL_LIMIT_MAXIMUM:
                 return GregorianCalendar::handleGetLimit(UCAL_YEAR, UCAL_LIMIT_MAXIMUM) - kEraInfo[kCurrentEra].year;
+            default:
+                return 1;    // Error condition, invalid limitType
             }
         }
     default: