organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-2943 fix compiler warnings

Browse source 
X-SVN-Rev: 13500
This commit is contained in:
Steven R. Loomis 2003-10-28 00:04:00 +00:00
parent 8e83685314
commit 4de3eb7b16
4 changed files with 27 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/i18n/buddhcal.cpp
View file

@ -92,7 +92,6 @@ int32_t
BuddhistCalendar::monthLength(int32_t month) const
{
UErrorCode status = U_ZERO_ERROR;
int32_t year = internalGet(UCAL_YEAR);
// ignore era
return GregorianCalendar::monthLength(month, getGregorianYear(status));
}
@ -188,7 +187,6 @@ void BuddhistCalendar::add(UCalendarDateFields field, int32_t amount, UErrorCode
if(field == UCAL_YEAR /* || field == UCAL_YEAR_WOY */) {
int32_t year = internalGet(field);
int32_t era = internalGetEra();
year += amount;

23
icu4c/source/i18n/calendar.cpp
View file

@ -205,11 +205,10 @@ protected:
return NULL;
}
int32_t len = 0;
UnicodeString myString = ures_getUnicodeStringByKey(rb, Calendar::kDefaultCalendar, &status);
#ifdef U_DEBUG_CALSVC
int32_t len = 0;
UErrorCode debugStatus = U_ZERO_ERROR;
const UChar *defCal = ures_getStringByKey(rb, Calendar::kDefaultCalendar, &len, &debugStatus);
fprintf(stderr, "... get string(%d) -> %s\n", len, u_errorName(debugStatus));
@ -504,8 +503,7 @@ Calendar::Calendar(const Calendar &source)
Calendar &
Calendar::operator=(const Calendar &right)
{
if (this != &right)
{
if (this != &right) {
uprv_arrayCopy(right.fFields, fFields, UCAL_FIELD_COUNT);
uprv_arrayCopy(right.fIsSet, fIsSet, UCAL_FIELD_COUNT);
uprv_arrayCopy(right.fStamp, fStamp, UCAL_FIELD_COUNT);
@ -572,8 +570,9 @@ Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& succ
const UnicodeString& str = *(UnicodeString*)u;
// Extract a char* out of it..
int32_t len = str.length();
if(len > sizeof(tmp)-1) {
len = sizeof(tmp)-1;
int32_t actLen = sizeof(tmp)-1;
if(len > actLen) {
len = actLen;
}
str.extract(0,len,tmp);
tmp[len]=0;
@ -1906,8 +1905,9 @@ int32_t Calendar::getLimit(UCalendarDateFields field, ELimitType limitType) cons
case UCAL_JULIAN_DAY:
case UCAL_MILLISECONDS_IN_DAY:
return kCalendarLimits[field][limitType];
default:
return handleGetLimit(field, limitType);
}
return handleGetLimit(field, limitType);
}
@ -2489,6 +2489,8 @@ int32_t Calendar::getLocalDOW()
case DOW_LOCAL:
dowLocal = internalGet(UCAL_DOW_LOCAL) - 1;
break;
default:
break;
}
dowLocal = dowLocal % 7;
if (dowLocal < 0) {
@ -2507,11 +2509,6 @@ int32_t Calendar::handleGetExtendedYearFromWeekFields(int32_t yearWoy, int32_t w
// First, we need a reliable DOW.
UCalendarDateFields bestField = resolveFields(kDatePrecedence); // !! Note: if subclasses have a different table, they should override handleGetExtendedYearFromWeekFields
UBool useMonth = (bestField == UCAL_DAY_OF_MONTH ||
bestField == UCAL_WEEK_OF_MONTH ||
bestField == UCAL_DAY_OF_WEEK_IN_MONTH);
// Now, a local DOW
int32_t dowLocal = getLocalDOW(); // 0..6
int32_t firstDayOfWeek = getFirstDayOfWeek(); // Localized fdw
@ -2748,6 +2745,8 @@ void Calendar::prepareGetActual(UCalendarDateFields field, UBool isMinimum, UErr
set(UCAL_DAY_OF_WEEK, dow);
}
break;
default:
;
}
// Do this last to give it the newest time stamp

35
icu4c/source/i18n/gregocal.cpp
View file

@ -153,8 +153,7 @@ static const UDate kPapalCutoverJulian = (2299161.0 - kEpochStartAsJulianDay);
GregorianCalendar::GregorianCalendar(UErrorCode& status)
: Calendar(TimeZone::createDefault(), Locale::getDefault(), status),
fGregorianCutover(kPapalCutover),
fNormalizedGregorianCutover(fGregorianCutover),
fGregorianCutoverYear(1582), fCutoverJulianDay(kCutoverJulianDay),
fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(1582),
fIsGregorian(TRUE), fInvertGregorian(FALSE)
{
setTimeInMillis(getNow(), status);
@ -165,8 +164,7 @@ GregorianCalendar::GregorianCalendar(UErrorCode& status)
GregorianCalendar::GregorianCalendar(TimeZone* zone, UErrorCode& status)
: Calendar(zone, Locale::getDefault(), status),
fGregorianCutover(kPapalCutover),
fNormalizedGregorianCutover(fGregorianCutover),
fGregorianCutoverYear(1582), fCutoverJulianDay(kCutoverJulianDay),
fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(1582),
fIsGregorian(TRUE), fInvertGregorian(FALSE)
{
setTimeInMillis(getNow(), status);
@ -177,8 +175,7 @@ GregorianCalendar::GregorianCalendar(TimeZone* zone, UErrorCode& status)
GregorianCalendar::GregorianCalendar(const TimeZone& zone, UErrorCode& status)
: Calendar(zone, Locale::getDefault(), status),
fGregorianCutover(kPapalCutover),
fNormalizedGregorianCutover(fGregorianCutover),
fGregorianCutoverYear(1582), fCutoverJulianDay(kCutoverJulianDay),
fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(1582),
fIsGregorian(TRUE), fInvertGregorian(FALSE)
{
setTimeInMillis(getNow(), status);
@ -189,8 +186,7 @@ GregorianCalendar::GregorianCalendar(const TimeZone& zone, UErrorCode& status)
GregorianCalendar::GregorianCalendar(const Locale& aLocale, UErrorCode& status)
: Calendar(TimeZone::createDefault(), aLocale, status),
fGregorianCutover(kPapalCutover),
fNormalizedGregorianCutover(fGregorianCutover),
fGregorianCutoverYear(1582), fCutoverJulianDay(kCutoverJulianDay),
fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(1582),
fIsGregorian(TRUE), fInvertGregorian(FALSE)
{
setTimeInMillis(getNow(), status);
@ -202,8 +198,7 @@ GregorianCalendar::GregorianCalendar(TimeZone* zone, const Locale& aLocale,
UErrorCode& status)
: Calendar(zone, aLocale, status),
fGregorianCutover(kPapalCutover),
fNormalizedGregorianCutover(fGregorianCutover),
fGregorianCutoverYear(1582), fCutoverJulianDay(kCutoverJulianDay),
fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(1582),
fIsGregorian(TRUE), fInvertGregorian(FALSE)
{
setTimeInMillis(getNow(), status);
@ -215,8 +210,7 @@ GregorianCalendar::GregorianCalendar(const TimeZone& zone, const Locale& aLocale
UErrorCode& status)
: Calendar(zone, aLocale, status),
fGregorianCutover(kPapalCutover),
fNormalizedGregorianCutover(fGregorianCutover),
fGregorianCutoverYear(1582), fCutoverJulianDay(kCutoverJulianDay),
fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(1582),
fIsGregorian(TRUE), fInvertGregorian(FALSE)
{
setTimeInMillis(getNow(), status);
@ -228,8 +222,7 @@ GregorianCalendar::GregorianCalendar(int32_t year, int32_t month, int32_t date,
UErrorCode& status)
: Calendar(TimeZone::createDefault(), Locale::getDefault(), status),
fGregorianCutover(kPapalCutover),
fNormalizedGregorianCutover(fGregorianCutover),
fGregorianCutoverYear(1582), fCutoverJulianDay(kCutoverJulianDay),
fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(1582),
fIsGregorian(TRUE), fInvertGregorian(FALSE)
{
set(UCAL_ERA, AD);
@ -244,8 +237,7 @@ GregorianCalendar::GregorianCalendar(int32_t year, int32_t month, int32_t date,
int32_t hour, int32_t minute, UErrorCode& status)
: Calendar(TimeZone::createDefault(), Locale::getDefault(), status),
fGregorianCutover(kPapalCutover),
fNormalizedGregorianCutover(fGregorianCutover),
fGregorianCutoverYear(1582), fCutoverJulianDay(kCutoverJulianDay),
fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(1582),
fIsGregorian(TRUE), fInvertGregorian(FALSE)
{
set(UCAL_ERA, AD);
@ -263,8 +255,7 @@ GregorianCalendar::GregorianCalendar(int32_t year, int32_t month, int32_t date,
UErrorCode& status)
: Calendar(TimeZone::createDefault(), Locale::getDefault(), status),
fGregorianCutover(kPapalCutover),
fNormalizedGregorianCutover(fGregorianCutover),
fGregorianCutoverYear(1582), fCutoverJulianDay(kCutoverJulianDay),
fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(1582),
fIsGregorian(TRUE), fInvertGregorian(FALSE)
{
set(UCAL_ERA, AD);
@ -287,8 +278,7 @@ GregorianCalendar::~GregorianCalendar()
GregorianCalendar::GregorianCalendar(const GregorianCalendar &source)
: Calendar(source),
fGregorianCutover(source.fGregorianCutover),
fNormalizedGregorianCutover(source.fNormalizedGregorianCutover),
fGregorianCutoverYear(source.fGregorianCutoverYear), fCutoverJulianDay(source.fCutoverJulianDay),
fCutoverJulianDay(source.fCutoverJulianDay), fNormalizedGregorianCutover(source.fNormalizedGregorianCutover), fGregorianCutoverYear(source.fGregorianCutoverYear),
fIsGregorian(source.fIsGregorian), fInvertGregorian(source.fInvertGregorian)
{
}
@ -482,7 +472,7 @@ int32_t GregorianCalendar::handleComputeJulianDay(UCalendarDateFields bestField)
// The following check handles portions of the cutover year BEFORE the
// cutover itself happens.
if (fIsGregorian != (jd >= fCutoverJulianDay)) { /* cutoverJulianDay)) { */
if ((fIsGregorian==TRUE) != (jd >= fCutoverJulianDay)) { /* cutoverJulianDay)) { */
#if defined (U_DEBUG_CAL)
fprintf(stderr, "%s:%d: jd was %d\n",
__FILE__, __LINE__, jd);
@ -1036,6 +1026,9 @@ int32_t GregorianCalendar::handleGetExtendedYear() {
//}
#endif
break;
default:
year = kEpochYear;
}
return year;
}

10
icu4c/source/i18n/japancal.cpp
View file

@ -327,11 +327,6 @@ int32_t JapaneseCalendar::getDefaultMonthInYear()
return kEraInfo[era].month-1;
}
if(era < kCurrentEra) {
// if we're not in the current era,
// fail_here;
}
return month;
}
@ -355,8 +350,7 @@ int32_t JapaneseCalendar::getDefaultDayInMonth(int32_t month)
int32_t JapaneseCalendar::internalGetEra() const
{
// OLD
internalGet(UCAL_ERA, kCurrentEra);
return internalGet(UCAL_ERA, kCurrentEra);
}
int32_t JapaneseCalendar::handleGetExtendedYear()
@ -494,7 +488,7 @@ int32_t JapaneseCalendar::handleGetLimit(UCalendarDateFields field, ELimitType l
if(needCalc) {
int32_t min = kEraInfo[1].year - kEraInfo[0].year;
int32_t max = min;
for (int32_t i=2; i<kEraCount; i++) { // counting by year, not field (3's)
for (uint32_t i=2; i<kEraCount; i++) { // counting by year, not field (3's)
int32_t d = kEraInfo[i].year - kEraInfo[i-1].year;
if (d < min) {
min = d;