| -rw-r--r-- | lib/hypnodata.cc | 5 | ||||
| -rw-r--r-- | lib/st-decode.cc | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/hypnodata.cc b/lib/hypnodata.cc index a64b7d7..376c7ff 100644 --- a/lib/hypnodata.cc +++ b/lib/hypnodata.cc @@ -1,50 +1,51 @@ -#include <stdlib.h> -#include <string.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <napkin/exception.h> #include <napkin/util.h> #include <napkin/types.h> namespace napkin { void hypnodata_t::clear() { to_bed = alarm = 0; data_a = window = 0; almost_awakes.clear(); } static time_t from_minute_w3c(const string& w3c) { struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1; if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d", &t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min)!=5) throw exception("failed to parse w3c time"); --t.tm_mon;t.tm_year-=1900; time_t rv = mktime(&t); if(rv==(time_t)-1) throw exception("failed to mktime()"); return rv; } void hypnodata_t::set_to_bed(const string& w3c) { to_bed = from_minute_w3c(w3c); } void hypnodata_t::set_alarm(const string& w3c) { alarm = from_minute_w3c(w3c); } void hypnodata_t::set_window(const string& str) { window = strtol(str.c_str(),0,10); /* TODO: check for error */ } void hypnodata_t::set_data_a(const string& str) { data_a = strtol(str.c_str(),0,10); /* TODO: check for error */ } void hypnodata_t::set_almost_awakes(const string& str) { almost_awakes.clear(); static const char *significants = "0123456789-T:Z"; string::size_type p = str.find_first_of(significants); struct tm t; memset(&t,0,sizeof(t)); t.tm_isdst=-1; while(p!=string::npos) { string::size_type ns = str.find_first_not_of(significants,p); string w3c; if(ns==string::npos) { w3c = str.substr(p); p = string::npos; }else{ w3c = str.substr(p,ns-p); p = str.find_first_of(significants,ns); 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) { |