X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Fdatetime.cpp;h=4c109758eb0e95d8b191d50152866856bbe48b46;hp=8886139d245a3a662fdf4d7758b26ada00c6af15;hb=1d05ea78e94897160f978f6103c5f4acf7fb43d3;hpb=bddffe4de070f28bcc1def8bfc5f86dc385aa81f diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp index 8886139..4c10975 100644 --- a/source/time/datetime.cpp +++ b/source/time/datetime.cpp @@ -63,7 +63,9 @@ DateTime::DateTime(int32_t y, uint8_t m, uint8_t d): minute(0), second(0), usec(0) -{ } +{ + validate(); +} DateTime::DateTime(int32_t y, uint8_t m, uint8_t d, uint8_t h, uint8_t n, uint8_t s): year(y), @@ -73,7 +75,9 @@ DateTime::DateTime(int32_t y, uint8_t m, uint8_t d, uint8_t h, uint8_t n, uint8_ minute(n), second(s), usec(0) -{ } +{ + validate(); +} DateTime::DateTime(int32_t y, uint8_t m, uint8_t d, uint8_t h, uint8_t n, uint8_t s, uint32_t u): year(y), @@ -83,7 +87,9 @@ DateTime::DateTime(int32_t y, uint8_t m, uint8_t d, uint8_t h, uint8_t n, uint8_ minute(n), second(s), usec(u) -{ } +{ + validate(); +} void DateTime::add_days(int32_t days) { @@ -280,5 +286,21 @@ void DateTime::normalize() } } +void DateTime::validate() const +{ + if(usec>=1000000) + throw InvalidParameterValue("Microseconds out of range"); + if(second>=60) + throw InvalidParameterValue("Seconds out of range"); + if(minute>=60) + throw InvalidParameterValue("Minutes out of range"); + if(hour>=24) + throw InvalidParameterValue("Hours out of range"); + if(month<1 || month>12) + throw InvalidParameterValue("Month out of range"); + if(mday<1 || mday>month_days(year, month)) + throw InvalidParameterValue("Day of month out of range"); +} + } // namespace Time } // namespace Msp