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,94 +1,95 @@
-#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);
             }
             if(w3c.empty()) continue;
             if(sscanf(w3c.c_str(),"%04d-%02d-%02dT%02d:%02d:%02d",
                     &t.tm_year,&t.tm_mon,&t.tm_mday,&t.tm_hour,&t.tm_min,&t.tm_sec)!=6)
                 throw exception("failed to parse w3c time");
             --t.tm_mon;t.tm_year-=1900;
             time_t aa = mktime(&t);
             if(aa==(time_t)-1)
                 throw exception("failed to mktime()");
             almost_awakes.push_back(aa);
         }
     }
 
     const string hypnodata_t::w3c_to_bed() const {
         return strftime("%Y-%m-%dT%H:%M",to_bed); }
     const string hypnodata_t::w3c_alarm() const {
         return strftime("%Y-%m-%dT%H:%M",alarm); }
     const string hypnodata_t::w3c_almostawakes() const {
         string rv;
         for(vector<time_t>::const_iterator i=almost_awakes.begin();i!=almost_awakes.end();++i) {
             if(!rv.empty())
                 rv += ',';
             rv += strftime("%Y-%m-%dT%H:%M:%S",*i);
         }
         return rv;
     }
 
     const string hypnodata_t::str_to_bed() const {
         return strftime("%H:%M",to_bed); }
     const string hypnodata_t::str_alarm() const {
         return strftime("%H:%M",alarm); }
     const string hypnodata_t::str_date() const {
         return strftime("%Y-%m-%d, %a",alarm); }
     const string hypnodata_t::str_data_a() const {
         char tmp[16];
         snprintf(tmp,sizeof(tmp),"%d:%02d:%02d",
                 data_a/3600, (data_a%3600)/60,
                 data_a % 60 );
         return tmp; }
 
     time_t hypnodata_t::aligned_start() const {
         return alarm - (alarm % (24*60*60)) - 24*60*60; }
 
 }
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,98 +1,99 @@
-#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) {
             if(data_length < (sizeof(st_data_header_t)+sizeof(st_data_footer_t)))
                 throw exception_st_data_envelope("not enough sleeptracker data to decode");
             st_data_header_t *h = (st_data_header_t*)data;
             if(h->magic != 'V')
                 throw exception_st_data_envelope("invalid magic in the data");
             st_data_footer_t *f = (st_data_footer_t*)(static_cast<const char *>(data)+data_length-sizeof(st_data_footer_t));
             if( (std::accumulate((uint8_t*)&h->today,(uint8_t*)&f->checksum,0)&0xFF) != f->checksum )
                 throw exception_st_data_integrity("checksum mismatch");
             st_fulltime_t *aawake = (st_fulltime_t*)&h[1];
             if((void*)&aawake[h->nawakes] != (void*)f)
                 throw exception_st_data_envelope("unbelievably screwed up data");
             rv.clear();
             time_t now = time(0);
             struct tm t;
             if(!localtime_r(&now,&t))
                 throw exception_st_data("failed to localtime_r()");
             t.tm_mon = h->today.month-1;
             t.tm_mday = h->today.day;
             time_t mkt = mktime(&t);
             if(mkt == (time_t)-1)
                 throw exception_st_data("failed to mktime() for a timestamp");
             if(mkt > now) {
                 --t.tm_year;
             }
             struct tm ta;
             memmove(&ta,&t,sizeof(ta));
             ta.tm_sec = 0;
             ta.tm_hour = h->alarm.hour; ta.tm_min = h->alarm.min;
             rv.alarm = mktime(&ta);
             if(rv.alarm == (time_t)-1)
                 throw exception_st_data("failed to mktime() for alarm");
             struct tm tb;
             memmove(&tb,&ta,sizeof(tb));
             tb.tm_hour = h->to_bed.hour; tb.tm_min = h->to_bed.min;
             rv.to_bed = mktime(&tb);
             if(rv.to_bed == (time_t)-1)
                 throw exception_st_data("failed to mktime() for 'to bed'");
             if(rv.to_bed > rv.alarm) {
                 back_a_day(tb);
                 rv.to_bed -= 24*60*60;
             }
             struct tm taaw;
             memmove(&taaw,&tb,sizeof(taaw));
             for(int rest=h->nawakes;rest;--rest,++aawake) {
                 if(
                         taaw.tm_mday!=ta.tm_mday
                         && (
                             aawake->hour < tb.tm_hour