author | Michael Krelin <hacker@klever.net> | 2009-12-12 00:21:52 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-12-12 00:21:52 (UTC) |
commit | 29ab361797d5677ce3296555efa7fe34dedaf0d4 (patch) (side-by-side diff) | |
tree | f0b328c790ddb405e56aa4c1653a73cbadd8135f /lib/st-decode.cc | |
parent | f888c15a5df36dcd767823cf5c223540270524c3 (diff) | |
download | napkin-29ab361797d5677ce3296555efa7fe34dedaf0d4.zip napkin-29ab361797d5677ce3296555efa7fe34dedaf0d4.tar.gz napkin-29ab361797d5677ce3296555efa7fe34dedaf0d4.tar.bz2 |
Thanks to Kevin Turner for spotting and patching it.
-rw-r--r-- | lib/st-decode.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/st-decode.cc b/lib/st-decode.cc index b354250..81cbb8f 100644 --- a/lib/st-decode.cc +++ b/lib/st-decode.cc @@ -1,50 +1,51 @@ -#include <stdlib.h> -#include <string.h> +#include <stdint.h> +#include <cstdlib> +#include <cstring> #include <stdexcept> #include <numeric> #include <napkin/exception.h> #include <napkin/st/decode.h> namespace napkin { namespace sleeptracker { using std::invalid_argument; using std::runtime_error; struct st_time_t { uint8_t hour; uint8_t min; }; struct st_date_t { uint8_t month; uint8_t day; uint8_t dow; }; struct st_fulltime_t { uint8_t hour; uint8_t min; uint8_t sec; }; struct st_data_header_t { char magic; st_date_t today; uint8_t window; st_time_t to_bed; st_time_t alarm; uint8_t nawakes; }; struct st_data_footer_t { uint16_t data_a; uint8_t checksum; uint8_t eof_mark; }; static void back_a_day(struct tm& t) { time_t ts = mktime(&t); if(ts==(time_t)-1) throw exception_st_data("failed to make up time to step back a day"); ts -= 60*60*24; if(!localtime_r(&ts,&t)) throw exception_st_data("failed to localtime_r() while stepping back a day"); } hypnodata_t& decode(hypnodata_t& rv,const void *data,size_t data_length) { |