summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems/src/clocktodvalidate.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2021-09-03 11:09:02 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2021-09-06 12:24:04 +0200
commitad41c17933e40f277d78b0f9d36b691c00bb8ca5 (patch)
treeeea4439c0ec3753cc129492fbc9f0e4c5d669423 /cpukit/rtems/src/clocktodvalidate.c
parentscore: Simplify _TOD_Validate() (diff)
downloadrtems-ad41c17933e40f277d78b0f9d36b691c00bb8ca5.tar.bz2
score: Change TOD_LATEST_YEAR to 2099
This simplifies the implementation a bit. Declare _TOD_Days_to_date[] in <rtems/score/todimpl.h>. Make _TOD_Days_per_month[] and _TOD_Days_since_last_leap_year[] static. Update #4338.
Diffstat (limited to 'cpukit/rtems/src/clocktodvalidate.c')
-rw-r--r--cpukit/rtems/src/clocktodvalidate.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/cpukit/rtems/src/clocktodvalidate.c b/cpukit/rtems/src/clocktodvalidate.c
index 0e3b5772b5..4433374e65 100644
--- a/cpukit/rtems/src/clocktodvalidate.c
+++ b/cpukit/rtems/src/clocktodvalidate.c
@@ -26,13 +26,13 @@
/*
* The following array contains the number of days in all months.
- * The first dimension should be 1 for leap years, and 0 otherwise.
+ * The first dimension should be 0 for leap years, and 1 otherwise.
* The second dimension should range from 1 to 12 for January to
- * February, respectively.
+ * December, respectively.
*/
-const uint32_t _TOD_Days_per_month[ 2 ][ 13 ] = {
- { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
- { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
+static const uint32_t _TOD_Days_per_month[ 2 ][ 13 ] = {
+ { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
+ { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
};
rtems_status_code _TOD_Validate(
@@ -40,6 +40,7 @@ rtems_status_code _TOD_Validate(
TOD_Ticks_validation ticks_validation
)
{
+ size_t leap_year_index;
uint32_t days_in_month;
uint32_t ticks_per_second;
uint32_t ticks_mask;
@@ -79,11 +80,8 @@ rtems_status_code _TOD_Validate(
return RTEMS_INVALID_CLOCK;
}
- if (((the_tod->year % 4) == 0 && (the_tod->year % 100 != 0)) ||
- (the_tod->year % 400 == 0))
- days_in_month = _TOD_Days_per_month[ 1 ][ the_tod->month ];
- else
- days_in_month = _TOD_Days_per_month[ 0 ][ the_tod->month ];
+ leap_year_index = _TOD_Get_leap_year_index( the_tod->year );
+ days_in_month = _TOD_Days_per_month[ leap_year_index ][ the_tod->month ];
if ( the_tod->day > days_in_month ) {
return RTEMS_INVALID_CLOCK;